Explorar o código

Fix overflow when doing SDL_sscanf("%hd", ...)

An overflow occured in the stdlib_sscanf test, when using msys2 clang32 toolchain.

(cherry picked from commit 342ec5113171214154cb197bb3e0e3a0056ea2ad)
Anonymous Maarten %!s(int64=2) %!d(string=hai) anos
pai
achega
10135b2d7b
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      src/stdlib/SDL_string.c

+ 3 - 1
src/stdlib/SDL_string.c

@@ -1190,7 +1190,9 @@ int SDL_vsscanf(const char *text, const char *fmt, va_list ap)
                     suppress = SDL_TRUE;
                     break;
                 case 'h':
-                    if (inttype > DO_SHORT) {
+                    if (inttype == DO_INT) {
+                        inttype = DO_SHORT;
+                    } else if (inttype > DO_SHORT) {
                         ++inttype;
                     }
                     break;