aboutsummaryrefslogtreecommitdiff
path: root/linux-user/linuxload.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-11-09 19:22:11 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2011-11-11 12:49:53 -0600
commit7dd47667b9b0b23807fc1a550644fc2427462f41 (patch)
tree51f12d2714c9b19fe289fadda9d6732ed0611b09 /linux-user/linuxload.c
parent096685fc2a955ea17d5363ab452e301be2b43873 (diff)
downloadqemu-7dd47667b9b0b23807fc1a550644fc2427462f41.zip
qemu-7dd47667b9b0b23807fc1a550644fc2427462f41.tar.gz
qemu-7dd47667b9b0b23807fc1a550644fc2427462f41.tar.bz2
linux-user/elfload.c: Don't memset(NULL..) if malloc() failed
If a malloc() in copy_elf_strings() failed we would call memset() before the "did malloc fail?" check. Fix this by moving to the glib alloc/free routines for this memory so we can use g_try_malloc0 rather than having a separate memset(). Spotted by Coverity (see bug 887883). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-user/linuxload.c')
-rw-r--r--linux-user/linuxload.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index 62ebc7e..b47025f 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -178,7 +178,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
/* Something went wrong, return the inode and free the argument pages*/
for (i=0 ; i<MAX_ARG_PAGES ; i++) {
- free(bprm->page[i]);
+ g_free(bprm->page[i]);
}
return(retval);
}