aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2010-05-21 10:37:51 -0700
committerAurelien Jarno <aurelien@aurel32.net>2010-05-28 23:27:19 +0200
commit50401022d8fbdcdaf84d28e7b813ee94c2d47325 (patch)
tree1d763f1b80af98c25bbba84fa6986a22b421642a
parent564e2fe8cd63ca6d5413408a1a4f9ee9cf471fff (diff)
Use calloc in qemu_mallocz.
Avoids the memset if the allocator has gotten new zeroed storage from the operating system. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--qemu-malloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/qemu-malloc.c b/qemu-malloc.c
index 6cdc5deb78..1b33e04601 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -69,10 +69,10 @@ void *qemu_realloc(void *ptr, size_t size)
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)