pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug #329

Browse source 
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.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402101
This commit is contained in:
Sam Lantinga 2006-09-23 22:51:37 +00:00
parent b8493a11ee
commit c18cc10c08
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL_compat.h
View file

@ -147,7 +147,7 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface *
surface); surface);
extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title, extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title,
const char *icon); 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 void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask);
extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void); extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void);
extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface); extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface);

7
src/SDL_compat.c
View file

@ -692,14 +692,17 @@ SDL_WM_SetCaption(const char *title, const char *icon)
{ {
if (wm_title) { if (wm_title) {
SDL_free(wm_title); SDL_free(wm_title);
} else { }
if (title) {
wm_title = SDL_strdup(title); wm_title = SDL_strdup(title);
} else {
wm_title = NULL;
} }
SDL_SetWindowTitle(SDL_VideoWindow, wm_title); SDL_SetWindowTitle(SDL_VideoWindow, wm_title);
} }
void void
SDL_WM_GetCaption(char **title, char **icon) SDL_WM_GetCaption(const char **title, const char **icon)
{ {
if (title) { if (title) {
*title = wm_title; *title = wm_title;