diff options
| author | Mikhail Lappo <miklelappo@gmail.com> | 2017-03-23 22:17:27 +0100 |
|---|---|---|
| committer | Mikhail Lappo <miklelappo@gmail.com> | 2017-03-23 22:41:14 +0100 |
| commit | 26464914feccfce4b835bd73a1130ba5be069e8a (patch) | |
| tree | b597796b46dbc7e9aafd8e6295f2ae8f2e58f1f4 /cpio | |
| parent | c0ca39c41ae2255ba86517ebe11c72b1fc44700d (diff) | |
| download | system_core-26464914feccfce4b835bd73a1130ba5be069e8a.tar.gz system_core-26464914feccfce4b835bd73a1130ba5be069e8a.tar.bz2 system_core-26464914feccfce4b835bd73a1130ba5be069e8a.zip | |
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
Diffstat (limited to 'cpio')
| -rw-r--r-- | cpio/mkbootfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |