From 5bfdb6e02fa6554b92367f34d9fc324e2ff9be5a Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Thu, 10 Aug 2023 23:43:58 +0200
Subject: [PATCH] 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)
(cherry picked from commit 10135b2d7bbed6ea0cba24410ebc12887d92968d)
---
src/stdlib/SDL_string.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c
index 616e3e125e9c..09c4489fc197 100644
--- a/src/stdlib/SDL_string.c
+++ b/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;