backfort fix for bug #3739: handle %lu, %li and %ld in SDL_SetError.

libsdl-org · Mar 24, 2018 · 4283569 · 4283569
1 parent 93b0bea
commit 4283569
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/SDL_error.c b/src/SDL_error.c
@@ -68,6 +68,17 @@ void SDL_SetError (const char *fmt, ...)
 			    case 0:  /* Malformed format string.. */
 				--fmt;
 				break;
+			    case 'l':
+				switch (*fmt++) {
+				case 0:  /* Malformed format string.. */
+					--fmt;
+					break;
+				case 'i': case 'd': case 'u':
+					error->args[error->argc++].value_l =
+								va_arg(ap, long);
+					break;
+				}
+				break;
 			    case 'c':
 			    case 'i':
 			    case 'd':
@@ -139,6 +150,21 @@ char *SDL_GetErrorMsg(char *errstr, int maxlen)
 				while ( (*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) && spot < (tmp+SDL_arraysize(tmp)-2) ) {
 					*spot++ = *fmt++;
 				}
+				if (*fmt == 'l') {
+					*spot++ = *fmt++;
+					*spot++ = *fmt++;
+					*spot++ = '\0';
+					switch (spot[-2]) {
+					case 'i': case 'd': case 'u':
+						len = SDL_snprintf(msg, maxlen, tmp, error->args[argi++].value_l);
+						if (len > 0) {
+						    msg += len;
+						    maxlen -= len;
+						}
+						break;
+					}
+					continue;
+				}
 				*spot++ = *fmt++;
 				*spot++ = '\0';
 				switch (spot[-2]) {

diff --git a/src/SDL_error_c.h b/src/SDL_error_c.h
@@ -50,6 +50,7 @@ typedef struct SDL_error {
 		unsigned char value_c;
 #endif
 		int value_i;
+		long value_l;
 		double value_f;
 		char buf[ERR_MAX_STRLEN];
 	} args[ERR_MAX_ARGS];