Do not abort on qemu_malloc(0) in production builds

qemu_malloc() does not allow size=0 to be passed in and aborts on this behavior.

Unfortunately, there is good reason to believe that within qemu, there are a
number of, so far, undetected places that assume size=0 can be safely passed.
Since we do not want to abort unnecessarily in production builds, return
qemu_malloc(1) whenever the version file indicates that this is a production
build.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2009-12-09 12:59:36 -06:00
parent 725b8a6983
commit 20ff6c8066
2 changed files with 30 additions and 7 deletions

View file

@ -42,22 +42,29 @@ void qemu_free(void *ptr)
free(ptr);
}
static int allow_zero_malloc(void)
{
#if defined(CONFIG_ZERO_MALLOC)
return 1;
#else
return 0;
#endif
}
void *qemu_malloc(size_t size)
{
if (!size) {
if (!size && !allow_zero_malloc()) {
abort();
}
return oom_check(malloc(size));
return oom_check(malloc(size ? size : 1));
}
void *qemu_realloc(void *ptr, size_t size)
{
if (size) {
return oom_check(realloc(ptr, size));
} else {
if (ptr) {
return realloc(ptr, size);
}
} else if (allow_zero_malloc()) {
return oom_check(realloc(ptr, size ? size : 1));
}
abort();
}