ngage: SDL_GetPrefPath allows a NULL org parameter.

icculus · icculus · commit 343ad3eddda6 · 2025-07-05T12:21:13.000-04:00
Reference Issue #13322.
diff --git a/src/filesystem/ngage/SDL_sysfilesystem.c b/src/filesystem/ngage/SDL_sysfilesystem.c
@@ -32,11 +32,11 @@ char *SDL_SYS_GetBasePath(void)
 
 char *SDL_SYS_GetPrefPath(const char *org, const char *app)
 {
-    char *pref_path;
-    if (SDL_asprintf(&pref_path, "C:/System/Apps/%s/%s/", org, app) < 0)
+    char *pref_path = NULL;
+    if (SDL_asprintf(&pref_path, "C:/System/Apps/%s/%s/", org ? org : "SDL_App", app) < 0) {
         return NULL;
-    else
-        return pref_path;
+    }
+    return pref_path;
 }
 
 char *SDL_SYS_GetUserFolder(SDL_Folder folder)

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ char *SDL_SYS_GetBasePath(void)`
`32`	`32`
`33`	`33`	`char SDL_SYS_GetPrefPath(const char org, const char *app)`
`34`	`34`	`{`
`35`		`- char *pref_path;`
`36`		`- if (SDL_asprintf(&pref_path, "C:/System/Apps/%s/%s/", org, app) < 0)`
	`35`	`+ char *pref_path = NULL;`
	`36`	`+ if (SDL_asprintf(&pref_path, "C:/System/Apps/%s/%s/", org ? org : "SDL_App", app) < 0) {`
`37`	`37`	`return NULL;`
`38`		`- else`
`39`		`- return pref_path;`
	`38`	`+ }`
	`39`	`+ return pref_path;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`char *SDL_SYS_GetUserFolder(SDL_Folder folder)`