зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1546881 - Fix OOM causing realloc to wrong arena r=sfink
Bug 1052579 introduced a new mozjemalloc arena for JSString char buffers. Unfortunately, my testing missed the case where JSStringBuilder causes an OOM condition, causing the OOM handler to realloc to the default arena, regardless of what arena is actually indicated by the AllocPolicy for the char vector. The realloc now passes the arena from the AllocPolicy to mozjemalloc. Differential Revision: https://phabricator.services.mozilla.com/D29092 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
e8b6f83dce
Коммит
ae3e160b94
|
@ -709,7 +709,7 @@ JS_FRIEND_API void* JSRuntime::onOutOfMemory(AllocFunction allocFunc,
|
|||
p = js_arena_calloc(arena, nbytes, 1);
|
||||
break;
|
||||
case AllocFunction::Realloc:
|
||||
p = js_realloc(reallocPtr, nbytes);
|
||||
p = js_arena_realloc(arena, reallocPtr, nbytes);
|
||||
break;
|
||||
default:
|
||||
MOZ_CRASH();
|
||||
|
|
Загрузка…
Ссылка в новой задаче