Don't crash if a NULL is passed for a "%s" parameter to SDL_SetError(),

instead replace it with the string "(null)", like glibc's printf() would do.
libsdl-org · Nov 17, 2005 · 33aae66 · 33aae66
1 parent 0b8bd70
commit 33aae66
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/SDL_error.c b/src/SDL_error.c
@@ -108,8 +108,10 @@ void SDL_SetError (const char *fmt, ...)
 			    case 's':
 				{
 				  int index = error->argc;
-				  strncpy((char *)error->args[index].buf,
-					va_arg(ap, char *), ERR_MAX_STRLEN);
+				  char *str = va_arg(ap, char *);
+				  if (str == NULL)
+				      str = "(null)";
+				  strncpy((char *)error->args[index].buf, str, ERR_MAX_STRLEN);
 				  error->args[index].buf[ERR_MAX_STRLEN-1] = 0;
 				  error->argc++;
 				}