Fixed bug #329

On tracing it turns out to fail from SDL_WM_SetCaption() On going through the function it looks like the SDL_free() function is called every alternate time with an invalid pointer that has already been freed.
libsdl-org · Sep 23, 2006 · a759fb0 · a759fb0
1 parent 7ad322f
commit a759fb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/include/SDL_compat.h b/include/SDL_compat.h
@@ -147,7 +147,7 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *
                                                             surface);
 extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title,
                                                const char *icon);
-extern DECLSPEC void SDLCALL SDL_WM_GetCaption(char **title, char **icon);
+extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title, const char **icon);
 extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask);
 extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
 extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface);

diff --git a/src/SDL_compat.c b/src/SDL_compat.c
@@ -692,14 +692,17 @@ SDL_WM_SetCaption(const char *title, const char *icon)
 {
     if (wm_title) {
         SDL_free(wm_title);
-    } else {
+    }
+    if (title) {
         wm_title = SDL_strdup(title);
+    } else {
+        wm_title = NULL;
     }
     SDL_SetWindowTitle(SDL_VideoWindow, wm_title);
 }
 
 void
-SDL_WM_GetCaption(char **title, char **icon)
+SDL_WM_GetCaption(const char **title, const char **icon)
 {
     if (title) {
         *title = wm_title;