TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-03-20 15:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

SDL_dynapi.c: Unload other SDL library if initializing the jumptable fails

Browse Source
This commit is contained in:
Petar Popovic
2026-03-16 18:08:43 +01:00
committed by Ryan C. Gordon
parent ff543723c4
commit 55fa5e0336
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/dynapi/SDL_dynapi.c
View File

@@ -448,17 +448,27 @@ Sint32 SDL_DYNAPI_entry(Uint32 apiver, void *table, Uint32 tablesize)
} }
#endif #endif
// The handle to the other SDL library, loaded with SDL_DYNAMIC_API_ENVVAR
#if defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN)
static HMODULE lib = NULL;
#elif defined(SDL_PLATFORM_UNIX) || defined(SDL_PLATFORM_APPLE) || defined(SDL_PLATFORM_HAIKU)
static void *lib = NULL;
#else
#error Please define your platform.
#endif
// Obviously we can't use SDL_LoadObject() to load SDL. :) // Obviously we can't use SDL_LoadObject() to load SDL. :)
// Also obviously, we never close the loaded library. // Also obviously, we never close the loaded library.
#if defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN) #if defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN)
static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym) static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
{ {
HMODULE lib = LoadLibraryA(fname); lib = LoadLibraryA(fname);
void *result = NULL; void *result = NULL;
if (lib) { if (lib) {
result = (void *) GetProcAddress(lib, sym); result = (void *) GetProcAddress(lib, sym);
if (!result) { if (!result) {
FreeLibrary(lib); FreeLibrary(lib);
lib = NULL;
} }
} }
return result; return result;
@@ -468,19 +478,17 @@ static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
#include <dlfcn.h> #include <dlfcn.h>
static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym) static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
{ {
void *lib = dlopen(fname, RTLD_NOW | RTLD_LOCAL); lib = dlopen(fname, RTLD_NOW | RTLD_LOCAL);
void *result = NULL; void *result = NULL;
if (lib) { if (lib) {
result = dlsym(lib, sym); result = dlsym(lib, sym);
if (!result) { if (!result) {
dlclose(lib); dlclose(lib);
lib = NULL;
} }
} }
return result; return result;
} }
#else
#error Please define your platform.
#endif #endif
static void dynapi_warn(const char *msg) static void dynapi_warn(const char *msg)
@@ -548,6 +556,16 @@ static void SDL_InitDynamicAPILocked(void)
if (entry) { if (entry) {
if (entry(SDL_DYNAPI_VERSION, &jump_table, sizeof(jump_table)) < 0) { if (entry(SDL_DYNAPI_VERSION, &jump_table, sizeof(jump_table)) < 0) {
dynapi_warn("Couldn't override SDL library. Using a newer SDL build might help. Please fix or remove the " SDL_DYNAMIC_API_ENVVAR " environment variable. Using the default SDL."); dynapi_warn("Couldn't override SDL library. Using a newer SDL build might help. Please fix or remove the " SDL_DYNAMIC_API_ENVVAR " environment variable. Using the default SDL.");
// unload the other SDL library
#if defined(WIN32) || defined(_WIN32) || defined(SDL_PLATFORM_CYGWIN)
FreeLibrary(lib);
lib = NULL;
#elif defined(SDL_PLATFORM_UNIX) || defined(SDL_PLATFORM_APPLE) || defined(SDL_PLATFORM_HAIKU)
dlclose(lib);
lib = NULL;
#endif
// Just fill in the function pointers from this library, later. // Just fill in the function pointers from this library, later.
} else { } else {
use_internal = false; // We overrode SDL! Don't use the internal version! use_internal = false; // We overrode SDL! Don't use the internal version!