diff options
author | David 'Digit' Turner <digit@android.com> | 2011-05-09 17:08:24 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:17 +0200 |
commit | 488bfd506a283c648f559140f51f125847d68664 (patch) | |
tree | e5ba3fff5e45a232df4002121c00cfef26908e39 /qemu-malloc.c | |
parent | 1646b4eb23bb788e9398583c442db9b70a85921a (diff) | |
download | external_qemu-488bfd506a283c648f559140f51f125847d68664.zip external_qemu-488bfd506a283c648f559140f51f125847d68664.tar.gz external_qemu-488bfd506a283c648f559140f51f125847d68664.tar.bz2 |
qemu-error: minor integrate
Change-Id: Ic6bc807b98e4dba0f2fcba046cd9a91a5d96f2cb
Diffstat (limited to 'qemu-malloc.c')
-rw-r--r-- | qemu-malloc.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/qemu-malloc.c b/qemu-malloc.c index 36b0b36..8749fc8 100644 --- a/qemu-malloc.c +++ b/qemu-malloc.c @@ -24,16 +24,9 @@ #include "qemu-common.h" #include <stdlib.h> -static void *oom_check(void *ptr) -{ - if (ptr == NULL) { - abort(); - } - return ptr; -} - void qemu_free(void *ptr) { + //trace_qemu_free(ptr); free(ptr); } @@ -48,26 +41,35 @@ static int allow_zero_malloc(void) void *qemu_malloc(size_t size) { + void *ptr; if (!size && !allow_zero_malloc()) { abort(); } - return oom_check(malloc(size ? size : 1)); + ptr = qemu_oom_check(malloc(size ? size : 1)); + //trace_qemu_malloc(size, ptr); + return ptr; } void *qemu_realloc(void *ptr, size_t size) { + void *newptr; if (!size && !allow_zero_malloc()) { abort(); } - return oom_check(realloc(ptr, size ? size : 1)); + newptr = qemu_oom_check(realloc(ptr, size ? size : 1)); + //trace_qemu_realloc(ptr, size, newptr); + return newptr; } void *qemu_mallocz(size_t size) { + void *ptr; if (!size && !allow_zero_malloc()) { abort(); } - return oom_check(calloc(1, size ? size : 1)); + ptr = qemu_oom_check(calloc(1, size ? size : 1)); + //trace_qemu_malloc(size, ptr); + return ptr; } char *qemu_strdup(const char *str) |