Skip to content
Permalink
Browse files
backfort fix for bug #3739: handle %lu, %li and %ld in SDL_SetError.
  • Loading branch information
sezero committed Mar 24, 2018
1 parent 93b0bea commit 42835696d19cbdb729f9430e46c2b0332a58d84a
Showing with 27 additions and 0 deletions.
  1. +26 −0 src/SDL_error.c
  2. +1 −0 src/SDL_error_c.h
@@ -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]) {
@@ -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];

0 comments on commit 4283569

Please sign in to comment.