summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qemu-malloc.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/qemu-malloc.c b/qemu-malloc.c
index 5e9f47f518..295d1856ef 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -26,8 +26,9 @@
static void *oom_check(void *ptr)
{
- if (ptr == NULL)
+ if (ptr == NULL) {
abort();
+ }
return ptr;
}
@@ -43,18 +44,20 @@ void qemu_free(void *ptr)
void *qemu_malloc(size_t size)
{
- if (!size)
+ if (!size) {
abort();
+ }
return oom_check(malloc(size));
}
void *qemu_realloc(void *ptr, size_t size)
{
- if (size)
+ if (size) {
return oom_check(realloc(ptr, size));
- else {
- if (ptr)
+ } else {
+ if (ptr) {
return realloc(ptr, size);
+ }
}
abort();
}
@@ -81,8 +84,9 @@ char *qemu_strndup(const char *str, size_t size)
const char *end = memchr(str, 0, size);
char *new;
- if (end)
+ if (end) {
size = end - str;
+ }
new = qemu_malloc(size + 1);
new[size] = 0;