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

Fixed crash if initialization of EGL failed but was tried again later.

Browse source 
The internal function SDL_EGL_LoadLibrary() did not delete and remove a mostly
uninitialized data structure if loading the library first failed. A later try to
use EGL then skipped initialization and assumed it was previously successful
because the data structure now already existed. This led to at least one crash
in the internal function SDL_EGL_ChooseConfig() because a NULL pointer was
dereferenced to make a call to eglBindAPI().
This commit is contained in:
Philipp Wiesemann 2015-06-21 17:33:46 +02:00
parent 500500d864
commit 38a1a45a02
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/video/SDL_egl.c
View file

@ -72,6 +72,7 @@
_this->egl_data->NAME = SDL_LoadFunction(_this->egl_data->dll_handle, #NAME); \
if (!_this->egl_data->NAME) \
{ \
SDL_EGL_UnloadLibrary(_this); \
return SDL_SetError("Could not retrieve EGL function " #NAME); \
}
@ -219,6 +220,7 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
_this->egl_data->egl_dll_handle = egl_dll_handle;
if (egl_dll_handle == NULL) {
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not initialize OpenGL / GLES library");
}
@ -240,6 +242,7 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
if (dll_handle != NULL) {
SDL_UnloadObject(dll_handle);
}
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not load EGL library");
}
SDL_ClearError();
@ -269,10 +272,12 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
#if !defined(__WINRT__)
_this->egl_data->egl_display = _this->egl_data->eglGetDisplay(native_display);
if (!_this->egl_data->egl_display) {
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not get EGL display");
}
if (_this->egl_data->eglInitialize(_this->egl_data->egl_display, NULL, NULL) != EGL_TRUE) {
SDL_EGL_UnloadLibrary(_this);
return SDL_SetError("Could not initialize EGL");
}
#endif