Fixed crash if conversion fails. Use ISO name for Latin-1

libsdl-org · Aug 12, 2007 · a0b076d · a0b076d
1 parent 6fa76ba
commit a0b076d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
@@ -448,9 +448,11 @@ SDL_GetKeyName(SDLKey key)
             char *cvt;
             temp[0] = (char) key;
             temp[1] = '\0';
-            cvt = SDL_iconv_string("UTF-8", "LATIN1", temp, 1);
-            SDL_strlcpy(temp, cvt, SDL_arraysize(temp));
-            SDL_free(cvt);
+            cvt = SDL_iconv_string("UTF-8", "ISO-8859-1", temp, 1);
+            if (cvt) {
+                SDL_strlcpy(temp, cvt, SDL_arraysize(temp));
+                SDL_free(cvt);
+            }
             keyname = temp;
         } else {
             keyname = "unknown key";