ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-25 07:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows GetBasePath should use GetModuleFileNameExW() and check for overflows.

Browse source 
Apparently you might get strange paths from GetModuleFileName(), such as
short path names or UNC filenames, so this avoids that problem. Since you have
to tapdance with linking different libraries and defining macros depending on
what Windows you plan to target, we dynamically load the API we need, which
works on all versions of Windows (on Win7, it'll load a compatibility wrapper
for the newer API location).

What a mess.

This also now does the right thing if there isn't enough space to store the
path, looping with a larger allocated buffer each try.

Fixes Bugzilla #2435.
This commit is contained in:
Ryan C. Gordon 2015-05-28 01:54:52 -04:00
parent 75702ffebc
commit 6d1ad3847a
1 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/filesystem/windows/SDL_sysfilesystem.c
View file

@ -36,11 +36,44 @@
char *
SDL_GetBasePath(void)
{
TCHAR path[MAX_PATH];
const DWORD len = GetModuleFileName(NULL, path, SDL_arraysize(path));
size_t i;
DWORD (WINAPI * pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD) = NULL;
DWORD buflen = 128;
WCHAR *path = NULL;
HANDLE psapi = LoadLibrary(L"psapi.dll");
char *retval = NULL;
DWORD len = 0;
SDL_assert(len < SDL_arraysize(path));
if (!psapi) {
WIN_SetError("Couldn't load psapi.dll");
return NULL;
}
pGetModuleFileNameExW = GetProcAddress(psapi, "GetModuleFileNameExW");
if (!pGetModuleFileNameExW) {
WIN_SetError("Couldn't find GetModuleFileNameExW");
FreeLibrary(psapi);
return NULL;
}
while (SDL_TRUE) {
path = (WCHAR *) SDL_malloc(path, buflen * sizeof (WCHAR));
if (!path) {
FreeLibrary(psapi);
SDL_OutOfMemory();
return NULL;
}
len = pGetModuleFileNameEx(GetCurrentProcess(), NULL, path, buflen);
if (len != buflen) {
break;
}
/* buffer too small? Try again. */
SDL_free(path);
len *= 2;
}
FreeLibrary(psapi);
if (len == 0) {
WIN_SetError("Couldn't locate our .exe");
@ -55,7 +88,11 @@ SDL_GetBasePath(void)
SDL_assert(i > 0); /* Should have been an absolute path. */
path[i+1] = '\0'; /* chop off filename. */
return WIN_StringToUTF8(path);
retval = WIN_StringToUTF8(path);
SDL_free(path);
return retval;
}
char *