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

Fixed bug 1313 - Segfault on SDL_CreateWindow when gl lib cannot be loaded

Browse source 
Don't crash if the gl_data isn't valid, just return NULL.
This commit is contained in:
Sam Lantinga 2012-01-07 23:33:15 -05:00
parent 1dafe0e989
commit 5b2a5e3412
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/video/x11/SDL_x11opengl.c
View file

@ -187,8 +187,10 @@ X11_GL_UnloadLibrary(_THIS)
#endif #endif
/* Free OpenGL memory */ /* Free OpenGL memory */
SDL_free(_this->gl_data); if (_this->gl_data) {
_this->gl_data = NULL; SDL_free(_this->gl_data);
_this->gl_data = NULL;
}
} }
static SDL_bool static SDL_bool
@ -396,6 +398,11 @@ X11_GL_GetVisual(_THIS, Display * display, int screen)
const int i = X11_GL_GetAttributes(_this,display,screen,attribs,max_attrs); const int i = X11_GL_GetAttributes(_this,display,screen,attribs,max_attrs);
SDL_assert(i <= max_attrs); SDL_assert(i <= max_attrs);
if (!_this->gl_data) {
/* The OpenGL library wasn't loaded, SDL_GetError() should have info */
return NULL;
}
vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs); vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
if (!vinfo) { if (!vinfo) {
SDL_SetError("Couldn't find matching GLX visual"); SDL_SetError("Couldn't find matching GLX visual");