gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: Fixed crashes if specifying hints to Emscripten as URL options.

Browse Source
This commit is contained in:
Ryan C. Gordon
2025-09-22 11:57:01 -04:00
parent d8124a0cea
commit f5d7004cbb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/emscripten/SDL_sysmain_runapp.c
View File

@@ -26,6 +26,11 @@
EM_JS_DEPS(sdlrunapp, "$dynCall,$stringToNewUTF8"); EM_JS_DEPS(sdlrunapp, "$dynCall,$stringToNewUTF8");
// even though we reference the C runtime's free() in other places, it appears
// to be inlined more aggressively in Emscripten 4, so we need a reference to
// it here, too, so the inlined Javascript doesn't fail to find it.
EMSCRIPTEN_KEEPALIVE void force_free(void *ptr) { free(ptr); }
int SDL_RunApp(int argc, char *argv[], SDL_main_func mainFunction, void * reserved) int SDL_RunApp(int argc, char *argv[], SDL_main_func mainFunction, void * reserved)
{ {
(void)reserved; (void)reserved;
@@ -44,8 +49,8 @@ int SDL_RunApp(int argc, char *argv[], SDL_main_func mainFunction, void * reserv
//console.log("Setting SDL env var '" + key + "' to '" + value + "' ..."); //console.log("Setting SDL env var '" + key + "' to '" + value + "' ...");
dynCall('iiii', $0, [ckey, cvalue, 1]); dynCall('iiii', $0, [ckey, cvalue, 1]);
} }
_free(ckey); // these must use free(), not SDL_free()! _force_free(ckey); // these must use free(), not SDL_free()!
_free(cvalue); _force_free(cvalue);
} }
} }
}, SDL_setenv_unsafe); }, SDL_setenv_unsafe);