diff options
author | David Turner <digit@android.com> | 2010-09-10 00:26:54 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2010-09-13 00:30:34 -0700 |
commit | d7e3529ed2789422175c1bf1fe9e0c48b668a11a (patch) | |
tree | df55ed9b6c46ea57f681c514470ec65f404578fb /qemu-malloc.c | |
parent | 1275f06d57fc62754e3b1abd4748e943ded966e5 (diff) | |
download | external_qemu-d7e3529ed2789422175c1bf1fe9e0c48b668a11a.zip external_qemu-d7e3529ed2789422175c1bf1fe9e0c48b668a11a.tar.gz external_qemu-d7e3529ed2789422175c1bf1fe9e0c48b668a11a.tar.bz2 |
upstream: qemu-malloc
Diffstat (limited to 'qemu-malloc.c')
-rw-r--r-- | qemu-malloc.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/qemu-malloc.c b/qemu-malloc.c index 5d9e34d..36b0b36 100644 --- a/qemu-malloc.c +++ b/qemu-malloc.c @@ -32,11 +32,6 @@ static void *oom_check(void *ptr) return ptr; } -void *get_mmap_addr(unsigned long size) -{ - return NULL; -} - void qemu_free(void *ptr) { free(ptr); @@ -61,20 +56,18 @@ void *qemu_malloc(size_t size) void *qemu_realloc(void *ptr, size_t size) { - if (size) { - return oom_check(realloc(ptr, size)); - } else if (allow_zero_malloc()) { - return oom_check(realloc(ptr, size ? size : 1)); + if (!size && !allow_zero_malloc()) { + abort(); } - abort(); + return oom_check(realloc(ptr, size ? size : 1)); } void *qemu_mallocz(size_t size) { - void *ptr; - ptr = qemu_malloc(size); - memset(ptr, 0, size); - return ptr; + if (!size && !allow_zero_malloc()) { + abort(); + } + return oom_check(calloc(1, size ? size : 1)); } char *qemu_strdup(const char *str) |