diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-01-17 21:36:06 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-02-09 21:24:05 +0100 |
| commit | b03088c32f8a88e4674f6cdab47da79ef4188d88 (patch) | |
| tree | 384d9d9db73928fc6dadd09ebba9cd6e090d9d5a | |
| parent | 23e4cff984cd22945b43705eed47911f5a02c645 (diff) | |
linux-user: Fix possible realloc memory leak
Extract from "man realloc":
"If realloc() fails the original block is left untouched;
it is not freed or moved."
Fix a possible memory leak (reported by cppcheck).
Cc: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Riku Voipio <riku.voipio@nokia.com>
(cherry picked from commit 8d79de6e42947a4a11ad7c7bb87e8f745a4f8321)
| -rw-r--r-- | linux-user/elfload.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 33d776de41..08c44d8933 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1481,7 +1481,7 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias) struct elf_shdr *shdr; char *strings; struct syminfo *s; - struct elf_sym *syms; + struct elf_sym *syms, *new_syms; shnum = hdr->e_shnum; i = shnum * sizeof(struct elf_shdr); @@ -1550,12 +1550,14 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias) that we threw away. Whether or not this has any effect on the memory allocation depends on the malloc implementation and how many symbols we managed to discard. */ - syms = realloc(syms, nsyms * sizeof(*syms)); - if (syms == NULL) { + new_syms = realloc(syms, nsyms * sizeof(*syms)); + if (new_syms == NULL) { free(s); + free(syms); free(strings); return; } + syms = new_syms; qsort(syms, nsyms, sizeof(*syms), symcmp); |