Skip to content

Commit af770e1

Browse files
committed
Fix various problems
1 parent 5b4c93b commit af770e1

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

src/deps_info.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"arc4random": ["rand"],
33
"freopen": ["free"],
44
"munmap": ["emscripten_builtin_free", "free"],
5-
"getenv": ["emscripten_builtin_malloc", "emscripten_builtin_free", "_get_environ"],
5+
"getenv": ["emscripten_builtin_malloc", "emscripten_builtin_free", "malloc", "free", "_get_environ"],
66
"clearenv": ["_get_environ"],
77
"setenv": ["_get_environ"],
88
"unsetenv": ["_get_environ"],
99
"putenv": ["_get_environ"],
1010
"environ": ["_get_environ"],
1111
"fmtmsg": ["_get_environ"],
1212
"get_current_dir_name": ["_get_environ"],
13-
"SDL_getenv": ["emscripten_builtin_malloc", "emscripten_builtin_free", "_get_environ"],
13+
"SDL_getenv": ["emscripten_builtin_malloc", "emscripten_builtin_free", "malloc", "free", "_get_environ"],
1414
"SDL_putenv": ["_get_environ"],
1515
"dlerror": ["malloc", "free"],
1616
"readdir": ["malloc"],

src/library.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,13 @@ LibraryManager.library = {
927927
name = UTF8ToString(name);
928928
if (!ENV.hasOwnProperty(name)) return 0;
929929

930+
#if WASM_BACKEND
930931
if (_getenv.ret) _emscripten_builtin_free(_getenv.ret);
931932
_getenv.ret = allocateUTF8(ENV[name], _emscripten_builtin_malloc);
933+
#else
934+
if (_getenv.ret) _free(_getenv.ret);
935+
_getenv.ret = allocateUTF8(ENV[name]);
936+
#endif
932937
return _getenv.ret;
933938
},
934939
// Alias for sanitizers which intercept getenv.

src/library_syscall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ var SyscallsLibrary = {
972972
{{{ makeSetValue('rlim', C_STRUCTS.rlimit.rlim_max + 4, '-1', 'i32') }}}; // RLIM_INFINITY
973973
return 0; // just report no limits
974974
},
975-
__syscall192__deps: ['emscripten_builtin_memalign'],
975+
__syscall192__deps: ['emscripten_builtin_memalign', 'memalign'],
976976
__syscall192: function(which, varargs) { // mmap2
977977
var addr = SYSCALLS.get(), len = SYSCALLS.get(), prot = SYSCALLS.get(), flags = SYSCALLS.get(), fd = SYSCALLS.get(), off = SYSCALLS.get()
978978
off <<= 12; // undo pgoffset

system/lib/compiler-rt/lib/lsan/lsan_common.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ static Suppression *GetSuppressionForStack(u32 stack_trace_id) {
691691
#if SANITIZER_EMSCRIPTEN
692692
// On Emscripten, the stack trace is the actual call site, not
693693
// the code that would be executed after the return.
694-
// THerefore, StackTrace::GetPreviousInstructionPc is not needed.
694+
// Therefore, StackTrace::GetPreviousInstructionPc is not needed.
695695
Suppression *s = GetSuppressionForAddr(stack.trace[i]);
696696
#else
697697
Suppression *s = GetSuppressionForAddr(

0 commit comments

Comments
 (0)