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

Fix Android TitleStorage: avoid leading '/' and handle NULL base path

Browse Source
This commit is contained in:
Corentin Recanzone
2025-09-12 20:17:11 +02:00
committed by Ryan C. Gordon
parent 0c5f7f6a33
commit 2079517802
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/storage/generic/SDL_genericstorage.c
View File

@@ -26,8 +26,19 @@
static char *GENERIC_INTERNAL_CreateFullPath(const char *base, const char *relative) static char *GENERIC_INTERNAL_CreateFullPath(const char *base, const char *relative)
{ {
const char *rel = relative;
#ifdef SDL_PLATFORM_ANDROID
if (rel) {
// Removes any leading slash
if (rel[0] == '/' || rel[0] == '\\') {
rel += 1;
}
}
#endif
char *result = NULL; char *result = NULL;
SDL_asprintf(&result, "%s%s", base ? base : "", relative); SDL_asprintf(&result, "%s%s", base ? base : "", rel ? rel : "");
return result; return result;
} }
@@ -239,15 +250,25 @@ static SDL_Storage *GENERIC_Title_Create(const char *override, SDL_PropertiesID
char *basepath = NULL; char *basepath = NULL;
if (override != NULL) { if (override != NULL) {
// make sure override has a path separator at the end. If you're not on Windows and used '\\', that's on you.
const size_t slen = SDL_strlen(override); const size_t slen = SDL_strlen(override);
const bool need_sep = (!slen || ((override[slen-1] != '/') && (override[slen-1] != '\\'))); if (slen > 0) {
// make sure override has a path separator at the end. If you're not on Windows and used '\\', that's on you.
const bool need_sep = ((override[slen - 1] != '/') && (override[slen - 1] != '\\'));
if (SDL_asprintf(&basepath, "%s%s", override, need_sep ? "/" : "") == -1) { if (SDL_asprintf(&basepath, "%s%s", override, need_sep ? "/" : "") == -1) {
return NULL; return NULL;
} }
} else {
// override == "" -> empty base (not "/")
basepath = SDL_strdup("");
}
} else { } else {
const char *base = SDL_GetBasePath(); const char *base = SDL_GetBasePath();
// On Android, SDL_GetBasePath() can be NULL: use empty base.
#ifdef SDL_PLATFORM_ANDROID
basepath = base ? SDL_strdup(base) : SDL_strdup("");
#else
basepath = base ? SDL_strdup(base) : NULL; basepath = base ? SDL_strdup(base) : NULL;
#endif
} }
if (basepath != NULL) { if (basepath != NULL) {