mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-15 06:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: Before SDL_main has run, use WideCharToMultibyte, not SDL_iconv.

Browse Source 
Otherwise, this will crash if the app sets its own SDL_malloc allocator, since
SDL_iconv uses SDL_malloc.

WideCharToMultibyte lets us calculate the needed memory for the argv[] string
conversions, and then we use the win32 HeapAlloc() API to get some memory
for it.

Fixes #8967.
This commit is contained in:
Ryan C. Gordon
2024-05-22 17:32:17 -04:00
parent 86b2f441c0
commit 25024ea295
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/gdk/SDL_gdk.cpp
View File

@@ -108,18 +108,21 @@ int SDL_RunApp(int, char**, SDL_main_func mainFunction, void *reserved)
return OutOfMemory(); return OutOfMemory();
} }
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
DWORD len; const int utf8size = WideCharToMultiByte(CP_UTF8, 0, argvw[i], -1, NULL, 0, NULL, NULL);
char *arg = WIN_StringToUTF8W(argvw[i]); if (!utf8size) { // uhoh?
if (arg == NULL) { SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal Error", "Error processing command line arguments", NULL);
return OutOfMemory(); return -1;
} }
len = (DWORD)SDL_strlen(arg);
argv[i] = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + 1); argv[i] = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, utf8size); // this size includes the null-terminator character.
if (!argv[i]) { if (!argv[i]) {
return OutOfMemory(); return OutOfMemory();
} }
SDL_memcpy(argv[i], arg, len);
SDL_free(arg); if (WideCharToMultiByte(CP_UTF8, 0, argvw[i], -1, argv[i], utf8size, NULL, NULL) == 0) { // failed? uhoh!
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal Error", "Error processing command line arguments", NULL);
return -1;
}
} }
argv[i] = NULL; argv[i] = NULL;
LocalFree(argvw); LocalFree(argvw);

19
src/core/windows/SDL_windows.c
View File

@@ -431,18 +431,21 @@ int MINGW32_FORCEALIGN SDL_RunApp(int _argc, char* _argv[], SDL_main_func mainFu
return OutOfMemory(); return OutOfMemory();
} }
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
DWORD len; const int utf8size = WideCharToMultiByte(CP_UTF8, 0, argvw[i], -1, NULL, 0, NULL, NULL);
char *arg = WIN_StringToUTF8W(argvw[i]); if (!utf8size) { // uhoh?
if (!arg) { SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal Error", "Error processing command line arguments", NULL);
return OutOfMemory(); return -1;
} }
len = (DWORD)SDL_strlen(arg);
argv[i] = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + 1); argv[i] = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, utf8size); // this size includes the null-terminator character.
if (!argv[i]) { if (!argv[i]) {
return OutOfMemory(); return OutOfMemory();
} }
SDL_memcpy(argv[i], arg, len);
SDL_free(arg); if (WideCharToMultiByte(CP_UTF8, 0, argvw[i], -1, argv[i], utf8size, NULL, NULL) == 0) { // failed? uhoh!
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Fatal Error", "Error processing command line arguments", NULL);
return -1;
}
} }
argv[i] = NULL; argv[i] = NULL;
LocalFree(argvw); LocalFree(argvw);