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

Dialog: Add suffix to filters all the time

Browse Source 
For some obscure reason I can't remember, I had made it so the suffix would be added only if the filter list was empty. That isn't the expected behavior and caused a mishandling of memory on Windows, which requires a two-null-bytes suffix.
This commit is contained in:
Semphris
2024-12-17 22:52:26 -05:00
committed by Sam Lantinga
parent b58e6d7274
commit bc9c86bcc2
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/dialog/SDL_dialog_utils.c
View File

@@ -78,22 +78,19 @@ char *convert_filters(const SDL_DialogFileFilter *filters, int nfilters,
SDL_free(converted); SDL_free(converted);
} }
// If the filter list is empty, put the suffix new_length = SDL_strlen(combined) + SDL_strlen(suffix) + 1;
if (!filters->name || !filters->pattern) {
new_length = SDL_strlen(combined) + SDL_strlen(suffix) + 1;
new_combined = (char *)SDL_realloc(combined, new_length); new_combined = (char *)SDL_realloc(combined, new_length);
if (!new_combined) { if (!new_combined) {
SDL_free(combined); SDL_free(combined);
return NULL; return NULL;
}
combined = new_combined;
SDL_strlcat(combined, suffix, new_length);
} }
combined = new_combined;
SDL_strlcat(combined, suffix, new_length);
return combined; return combined;
} }