tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."

Browse source
This commit is contained in:
Elliott Hughes 2012-09-04 15:51:55 -07:00 committed by android code review
commit e03ab93699
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libc/upstream-dlmalloc/malloc.c
View file

@ -4049,12 +4049,20 @@ static void* sys_alloc(mstate m, size_t nb) {
}
asize = granularity_align(nb + SYS_ALLOC_PADDING);
if (asize <= nb)
if (asize <= nb) {
/* BEGIN android-added: set errno */
MALLOC_FAILURE_ACTION;
/* END android-added */
return 0; /* wraparound */
}
if (m->footprint_limit != 0) {
size_t fp = m->footprint + asize;
if (fp <= m->footprint || fp > m->footprint_limit)
if (fp <= m->footprint || fp > m->footprint_limit) {
/* BEGIN android-added: set errno */
MALLOC_FAILURE_ACTION;
/* END android-added */
return 0;
}
}
/*