|
@@ -186,23 +186,26 @@ malloc (size_t size)
|
|
|
__heap_check (&__malloc_heap, "malloc");
|
|
|
#endif
|
|
|
|
|
|
-#if defined(__MALLOC_GLIBC_COMPAT__)
|
|
|
- if (unlikely(size == 0))
|
|
|
- size++;
|
|
|
+#ifdef __MALLOC_GLIBC_COMPAT__
|
|
|
+ if (unlikely (size == 0))
|
|
|
+ size++;
|
|
|
#else
|
|
|
|
|
|
- if (unlikely(size == 0))
|
|
|
- goto oom;
|
|
|
+ if (unlikely (size == 0))
|
|
|
+ return 0;
|
|
|
#endif
|
|
|
+
|
|
|
|
|
|
if (unlikely(((unsigned long)size > (unsigned long)(MALLOC_HEADER_SIZE*-2))))
|
|
|
- goto oom;
|
|
|
+ goto oom;
|
|
|
|
|
|
mem = malloc_from_heap (size, &__malloc_heap);
|
|
|
- if (unlikely(!mem)) {
|
|
|
-oom:
|
|
|
- __set_errno(ENOMEM);
|
|
|
- return NULL;
|
|
|
- }
|
|
|
+ if (unlikely (!mem))
|
|
|
+ {
|
|
|
+ oom:
|
|
|
+ __set_errno (ENOMEM);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
return mem;
|
|
|
}
|