Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions src/storage/generic/SDL_genericstorage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,19 @@

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;
SDL_asprintf(&result, "%s%s", base ? base : "", relative);
SDL_asprintf(&result, "%s%s", base ? base : "", rel ? rel : "");
return result;
}

Expand Down Expand Up @@ -239,15 +250,25 @@ static SDL_Storage *GENERIC_Title_Create(const char *override, SDL_PropertiesID
char *basepath = 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 bool need_sep = (!slen || ((override[slen-1] != '/') && (override[slen-1] != '\\')));
if (SDL_asprintf(&basepath, "%s%s", override, need_sep ? "/" : "") == -1) {
return NULL;
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) {
return NULL;
}
} else {
// override == "" -> empty base (not "/")
basepath = SDL_strdup("");
}
} else {
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;
#endif
}

if (basepath != NULL) {
Expand Down
Loading