From 38a1a45a024e30eb24ef00be3889780cd406cb40 Mon Sep 17 00:00:00 2001 From: Philipp Wiesemann Date: Sun, 21 Jun 2015 17:33:46 +0200 Subject: [PATCH] Fixed crash if initialization of EGL failed but was tried again later. 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(). --- src/video/SDL_egl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c index c7184bd02..4461017de 100644 --- a/src/video/SDL_egl.c +++ b/src/video/SDL_egl.c @@ -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