dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: don't call realloc(non_null, 0) when no symbols are present

Browse Source 
According to C99, realloc(non_null, 0) != free(non_null), that's why
it is forbidden in QEMU.

When there are no symbols, nsyms equals to 0. Free the syms structure
and set it to NULL instead of reallocating it with a size of 0.

This fixes -kernel with stripped kernels.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Aurelien Jarno
2009-12-28 21:18:12 +01:00
parent b430a22562
commit 3e372cf87f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hw/elf_ops.h
View File

@@ -149,9 +149,14 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
} }
i++; i++;
} }
syms = qemu_realloc(syms, nsyms * sizeof(*syms)); if (nsyms) {
syms = qemu_realloc(syms, nsyms * sizeof(*syms));
qsort(syms, nsyms, sizeof(*syms), glue(symcmp, SZ)); qsort(syms, nsyms, sizeof(*syms), glue(symcmp, SZ));
} else {
qemu_free(syms);
syms = NULL;
}
/* String table */ /* String table */
if (symtab->sh_link >= ehdr->e_shnum) if (symtab->sh_link >= ehdr->e_shnum)