projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
qemu-malloc.c
diff --git
a/qemu-malloc.c
b/qemu-malloc.c
index
6761857
..
295d185
100644
(file)
--- a/
qemu-malloc.c
+++ b/
qemu-malloc.c
@@
-26,8
+26,9
@@
static void *oom_check(void *ptr)
{
static void *oom_check(void *ptr)
{
- if (ptr == NULL)
+ if (ptr == NULL) {
abort();
abort();
+ }
return ptr;
}
return ptr;
}
@@
-43,15
+44,22
@@
void qemu_free(void *ptr)
void *qemu_malloc(size_t size)
{
void *qemu_malloc(size_t size)
{
+ if (!size) {
+ abort();
+ }
return oom_check(malloc(size));
}
void *qemu_realloc(void *ptr, size_t size)
{
return oom_check(malloc(size));
}
void *qemu_realloc(void *ptr, size_t size)
{
- if (size)
+ if (size) {
return oom_check(realloc(ptr, size));
return oom_check(realloc(ptr, size));
- else
- return realloc(ptr, size);
+ } else {
+ if (ptr) {
+ return realloc(ptr, size);
+ }
+ }
+ abort();
}
void *qemu_mallocz(size_t size)
}
void *qemu_mallocz(size_t size)
@@
-76,8
+84,9
@@
char *qemu_strndup(const char *str, size_t size)
const char *end = memchr(str, 0, size);
char *new;
const char *end = memchr(str, 0, size);
char *new;
- if (end)
+ if (end) {
size = end - str;
size = end - str;
+ }
new = qemu_malloc(size + 1);
new[size] = 0;
new = qemu_malloc(size + 1);
new[size] = 0;