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

Fix memory leaks in X11_CreateDevice error paths

Browse source 
Patch contributed by Andre Heider
This commit is contained in:
Sam Lantinga 2012-07-18 14:48:32 -07:00
parent a00f1423be
commit aa816459ab
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video/x11/SDL_x11video.c
View file

@ -148,6 +148,8 @@ X11_CreateDevice(int devindex)
device->gles_data = (struct SDL_PrivateGLESData *) SDL_calloc(1, sizeof(SDL_PrivateGLESData)); device->gles_data = (struct SDL_PrivateGLESData *) SDL_calloc(1, sizeof(SDL_PrivateGLESData));
if (!device->gles_data) { if (!device->gles_data) {
SDL_OutOfMemory(); SDL_OutOfMemory();
SDL_free(device->driverdata);
SDL_free(device);
return NULL; return NULL;
} }
#endif #endif
@ -175,6 +177,10 @@ X11_CreateDevice(int devindex)
} }
#endif #endif
if (data->display == NULL) { if (data->display == NULL) {
#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
SDL_free(device->gles_data);
#endif
SDL_free(device->driverdata);
SDL_free(device); SDL_free(device);
SDL_SetError("Couldn't open X11 display"); SDL_SetError("Couldn't open X11 display");
return NULL; return NULL;