commit 8ce01a3765b56125708d9603545d590af1ae097c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 24 01:50:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 24 01:50:57 2017 +0000
tree 53a8fafa9d1b74b4c9d26a0040b01ae4cb59db11
parent ba63929c60d67dc154739d4aaf7532f458eadb1b
parent e8e2577405a0838c10ae8e0cbfaf9d849dea1c58

Merge "add clear log for reboot start / end"

cpio/mkbootfs.c

diff --git a/cpio/mkbootfs.c b/cpio/mkbootfs.c
index b89c395..e52762e 100644
--- a/cpio/mkbootfs.c
+++ b/cpio/mkbootfs.c
@@ -301,6 +301,7 @@
             allocated *= 2;
             canned_config = (struct fs_config_entry*)realloc(
                 canned_config, allocated * sizeof(struct fs_config_entry));
+            if (canned_config == NULL) die("failed to reallocate memory");
         }
 
         struct fs_config_entry* cc = canned_config + used;
@@ -320,6 +321,7 @@
         ++allocated;
         canned_config = (struct fs_config_entry*)realloc(
             canned_config, allocated * sizeof(struct fs_config_entry));
+        if (canned_config == NULL) die("failed to reallocate memory");
     }
     canned_config[used].name = NULL;