Use SDL_asprintf instead of calculating and allocating a buffer.

icculus · icculus · commit 6cab389e8993 · 2024-11-14T11:29:10.000-05:00
diff --git a/dirksimple_sdl.c b/dirksimple_sdl.c
@@ -68,12 +68,8 @@ void DirkSimple_panic(const char *str)
 
 static DIRKSIMPLE_NORETURN void sdlpanic(const char *what)
 {
-    const char *sdlerr = SDL_GetError();
-    const size_t slen = SDL_strlen(sdlerr) + SDL_strlen(what) + 32;
-    char *errstr = SDL_malloc(slen);
-    if (errstr) {
-        SDL_snprintf(errstr, slen, "%s: %s", what, SDL_GetError());
-    }
+    char *errstr = NULL;
+    SDL_asprintf(&errstr, "%s: %s", what, SDL_GetError());
     DirkSimple_panic(errstr ? errstr : what);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,8 @@ void DirkSimple_panic(const char *str)`
`68`	`68`
`69`	`69`	`static DIRKSIMPLE_NORETURN void sdlpanic(const char *what)`
`70`	`70`	`{`
`71`		`- const char *sdlerr = SDL_GetError();`
`72`		`- const size_t slen = SDL_strlen(sdlerr) + SDL_strlen(what) + 32;`
`73`		`- char *errstr = SDL_malloc(slen);`
`74`		`- if (errstr) {`
`75`		`- SDL_snprintf(errstr, slen, "%s: %s", what, SDL_GetError());`
`76`		`- }`
	`71`	`+ char *errstr = NULL;`
	`72`	`+ SDL_asprintf(&errstr, "%s: %s", what, SDL_GetError());`
`77`	`73`	`DirkSimple_panic(errstr ? errstr : what);`
`78`	`74`	`}`
`79`	`75`