arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-24 19:42:27 +03:00
Code Activity

Fixed OOM double count in umm_realloc. (#7768)

Browse Source
This commit is contained in:
M Hightower
2020-12-14 12:47:11 -08:00
committed by GitHub
parent 9eb618e3af
commit dd8c2e6b8b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cores/esp8266/umm_malloc/umm_malloc.cpp
View File

@ -1038,7 +1038,7 @@ void *umm_realloc( void *ptr, size_t size ) {
} else { } else {
DBGLOG_DEBUG( "realloc %i to a bigger block %i failed - return NULL and leave the old block!\n", blockSize, blocks ); DBGLOG_DEBUG( "realloc %i to a bigger block %i failed - return NULL and leave the old block!\n", blockSize, blocks );
/* This space intentionally left blnk */ /* This space intentionally left blnk */
STATS__OOM_UPDATE(); /* STATS__OOM_UPDATE() has already been called by umm_malloc_core - don't duplicate count */
} }
/* This is not accurate for OOM case; however, it will work for /* This is not accurate for OOM case; however, it will work for
* stopping a call to free before return. * stopping a call to free before return.
@ -1117,7 +1117,7 @@ void *umm_realloc( void *ptr, size_t size ) {
} else { } else {
DBGLOG_DEBUG( "realloc %d to a bigger block %d failed - return NULL and leave the old block!\n", blockSize, blocks ); DBGLOG_DEBUG( "realloc %d to a bigger block %d failed - return NULL and leave the old block!\n", blockSize, blocks );
/* This space intentionally left blnk */ /* This space intentionally left blnk */
STATS__OOM_UPDATE(); /* STATS__OOM_UPDATE() has already been called by umm_malloc_core - don't duplicate count */
} }
/* This is not accurate for OOM case; however, it will work for /* This is not accurate for OOM case; however, it will work for
* stopping a call to free before return. * stopping a call to free before return.
@ -1142,7 +1142,7 @@ void *umm_realloc( void *ptr, size_t size ) {
} else { } else {
DBGLOG_DEBUG( "realloc %d to a bigger block %d failed - return NULL and leave the old block!\n", blockSize, blocks ); DBGLOG_DEBUG( "realloc %d to a bigger block %d failed - return NULL and leave the old block!\n", blockSize, blocks );
/* This space intentionally left blnk */ /* This space intentionally left blnk */
STATS__OOM_UPDATE(); /* STATS__OOM_UPDATE() has already been called by umm_malloc_core - don't duplicate count */
} }
/* This is not accurate for OOM case; however, it will work for /* This is not accurate for OOM case; however, it will work for
* stopping a call to free before return. * stopping a call to free before return.