diff options
| author | Richard Henderson | 2010-07-29 18:37:01 +0200 |
|---|---|---|
| committer | malc | 2010-07-29 18:54:35 +0200 |
| commit | 5d5c99300d91d67c3f70058d2431a633028e3a9e (patch) | |
| tree | a6aa3414233adb4aeb09fa2db419558262e34d4f /linux-user | |
| parent | cris: Correct settls1 testcase. (diff) | |
| download | qemu-5d5c99300d91d67c3f70058d2431a633028e3a9e.tar.gz qemu-5d5c99300d91d67c3f70058d2431a633028e3a9e.tar.xz qemu-5d5c99300d91d67c3f70058d2431a633028e3a9e.zip | |
linux-user: Protect against allocation failure in load_symbols.
Cc: malc <av1474@comtv.ru>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/elfload.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a53285ae39..33d776de41 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1546,7 +1546,17 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias) } } + /* Attempt to free the storage associated with the local symbols + 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) { + free(s); + free(strings); + return; + } + qsort(syms, nsyms, sizeof(*syms), symcmp); s->disas_num_syms = nsyms; |