Commit d9f378530b17f2031e0a212f3e83d49124fe3c2d
2015-03-24T03:12:35
Make SDL error string formatting deal with nasty corner cases. We continued looping while maxlen > 0, but maxlen was unsigned, so an overflow would make it a large number instead of negative. Fixed. Some snprintf() implementations might return a negative value if there isn't enough space, and we now check for that. Don't overrun the SDL error message buffer, if snprintf() returned the number of chars it wanted to write instead of the number it did. snprintf is a portability mess, we should just never use the C runtime for it. Fixes Bugzilla #2049.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/src/SDL_error.c b/src/SDL_error.c
index 2df29aa..80e8620 100644
--- a/src/SDL_error.c
+++ b/src/SDL_error.c
@@ -120,7 +120,7 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
so that it supports internationalization and thread-safe errors.
*/
static char *
-SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
+SDL_GetErrorMsg(char *errstr, int maxlen)
{
SDL_error *error;
@@ -163,37 +163,55 @@ SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
len =
SDL_snprintf(msg, maxlen, tmp,
error->args[argi++].value_i);
- msg += len;
- maxlen -= len;
+ if (len > 0) {
+ msg += len;
+ maxlen -= len;
+ }
break;
+
case 'f':
len =
SDL_snprintf(msg, maxlen, tmp,
error->args[argi++].value_f);
- msg += len;
- maxlen -= len;
+ if (len > 0) {
+ msg += len;
+ maxlen -= len;
+ }
break;
+
case 'p':
len =
SDL_snprintf(msg, maxlen, tmp,
error->args[argi++].value_ptr);
- msg += len;
- maxlen -= len;
+ if (len > 0) {
+ msg += len;
+ maxlen -= len;
+ }
break;
+
case 's':
len =
SDL_snprintf(msg, maxlen, tmp,
SDL_LookupString(error->args[argi++].
buf));
- msg += len;
- maxlen -= len;
+ if (len > 0) {
+ msg += len;
+ maxlen -= len;
+ }
break;
+
}
} else {
*msg++ = *fmt++;
maxlen -= 1;
}
}
+
+ /* slide back if we've overshot the end of our buffer. */
+ if (maxlen < 0) {
+ msg -= (-maxlen) + 1;
+ }
+
*msg = 0; /* NULL terminate the string */
}
return (errstr);