From 26464914feccfce4b835bd73a1130ba5be069e8a Mon Sep 17 00:00:00 2001 From: Mikhail Lappo Date: Thu, 23 Mar 2017 22:17:27 +0100 Subject: [PATCH] Possible null pointer miss on realloc Realloc can return null pointer which will cause a crash then. Patch introduces check for controlled 'die' in case memory is not available Change-Id: I279028339b1fe756d8a511834e164e59d4cab110 --- cpio/mkbootfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpio/mkbootfs.c b/cpio/mkbootfs.c index b89c3952c..e52762e9b 100644 --- a/cpio/mkbootfs.c +++ b/cpio/mkbootfs.c @@ -301,6 +301,7 @@ static void read_canned_config(char* filename) 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 @@ static void read_canned_config(char* filename) ++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;