projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
at91: define matrix registers bit fields
[oweals/u-boot.git]
/
common
/
dlmalloc.c
diff --git
a/common/dlmalloc.c
b/common/dlmalloc.c
index 735b3443e63a556e0af9dbd63f3def0286f85a0a..2276532da7a8441c500c39b1716e23a2806a8c21 100644
(file)
--- a/
common/dlmalloc.c
+++ b/
common/dlmalloc.c
@@
-1515,7
+1515,7
@@
void *sbrk(ptrdiff_t increment)
ulong new = old + increment;
if ((new < mem_malloc_start) || (new > mem_malloc_end))
ulong new = old + increment;
if ((new < mem_malloc_start) || (new > mem_malloc_end))
- return
NULL
;
+ return
(void *)MORECORE_FAILURE
;
mem_malloc_brk = new;
mem_malloc_brk = new;
@@
-2179,6
+2179,12
@@
Void_t* mALLOc(bytes) size_t bytes;
INTERNAL_SIZE_T nb;
INTERNAL_SIZE_T nb;
+ /* check if mem_malloc_init() was run */
+ if ((mem_malloc_start == 0) && (mem_malloc_end == 0)) {
+ /* not initialized yet */
+ return 0;
+ }
+
if ((long)bytes < 0) return 0;
nb = request2size(bytes); /* padded request size; */
if ((long)bytes < 0) return 0;
nb = request2size(bytes); /* padded request size; */