Skip to content

Commit 6ac5f36

Browse files
authored
Add realloc to withBuiltinMalloc (#24469)
Fixes ASan failures after #24416
1 parent e922970 commit 6ac5f36

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/lib/libcore.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,26 +1461,29 @@ addToLibrary({
14611461
// When lsan or asan is enabled withBuiltinMalloc temporarily replaces calls
14621462
// to malloc, calloc, free, and memalign.
14631463
$withBuiltinMalloc__deps: [
1464-
'malloc', 'calloc', 'free', 'memalign',
1465-
'emscripten_builtin_malloc', 'emscripten_builtin_free', 'emscripten_builtin_memalign', 'emscripten_builtin_calloc'
1464+
'malloc', 'calloc', 'free', 'memalign', 'realloc',
1465+
'emscripten_builtin_malloc', 'emscripten_builtin_free', 'emscripten_builtin_memalign', 'emscripten_builtin_calloc', 'emscripten_builtin_realloc'
14661466
],
14671467
$withBuiltinMalloc__docs: '/** @suppress{checkTypes} */',
14681468
$withBuiltinMalloc: (func) => {
14691469
var prev_malloc = typeof _malloc != 'undefined' ? _malloc : undefined;
14701470
var prev_calloc = typeof _calloc != 'undefined' ? _calloc : undefined;
14711471
var prev_memalign = typeof _memalign != 'undefined' ? _memalign : undefined;
14721472
var prev_free = typeof _free != 'undefined' ? _free : undefined;
1473+
var prev_realloc = typeof _realloc != 'undefined' ? _realloc : undefined;
14731474
_malloc = _emscripten_builtin_malloc;
14741475
_calloc = _emscripten_builtin_calloc;
14751476
_memalign = _emscripten_builtin_memalign;
14761477
_free = _emscripten_builtin_free;
1478+
_realloc = _emscripten_builtin_realloc;
14771479
try {
14781480
return func();
14791481
} finally {
14801482
_malloc = prev_malloc;
14811483
_calloc = prev_calloc;
14821484
_memalign = prev_memalign;
14831485
_free = prev_free;
1486+
_realloc = prev_realloc;
14841487
}
14851488
},
14861489

0 commit comments

Comments
 (0)