geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL_iconv_string() defaults to UTF-8 

Fixes https://github.com/libsdl-org/SDL/issues/8287
main
Sam Lantinga 2023-09-24 17:27:23 -07:00
parent 70a1bc6973
commit 1375d2049d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stdlib/SDL_iconv.c
View File

@ -786,9 +786,6 @@ char *SDL_iconv_string(const char *tocode, const char *fromcode, const char *inb
size_t outbytesleft; size_t outbytesleft;
size_t retCode = 0; size_t retCode = 0;
cd = SDL_iconv_open(tocode, fromcode);
if (cd == (SDL_iconv_t)-1) {
/* See if we can recover here (fixes iconv on Solaris 11) */
if (tocode == NULL || !*tocode) { if (tocode == NULL || !*tocode) {
tocode = "UTF-8"; tocode = "UTF-8";
} }
@ -796,7 +793,6 @@ char *SDL_iconv_string(const char *tocode, const char *fromcode, const char *inb
fromcode = "UTF-8"; fromcode = "UTF-8";
} }
cd = SDL_iconv_open(tocode, fromcode); cd = SDL_iconv_open(tocode, fromcode);
}
if (cd == (SDL_iconv_t)-1) { if (cd == (SDL_iconv_t)-1) {
return NULL; return NULL;
} }