Dynamic API: don't leak if a library loaded but didn't have the entry point.
authorRyan C. Gordon <icculus@icculus.org>
Mon, 05 Jan 2015 01:07:36 -0500
changeset 9305 0c66e0df64f6
parent 9304 e64d9374f1be
child 9306 817656bd36ec
Dynamic API: don't leak if a library loaded but didn't have the entry point.
src/dynapi/SDL_dynapi.c
--- a/src/dynapi/SDL_dynapi.c	Wed Dec 31 21:00:32 2014 +0100
+++ b/src/dynapi/SDL_dynapi.c	Mon Jan 05 01:07:36 2015 -0500
@@ -206,7 +206,14 @@
 static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
 {
     HANDLE lib = LoadLibraryA(fname);
-    return lib ? GetProcAddress(lib, sym) : NULL;
+    void *retval = NULL;
+    if (lib) {
+        retval = GetProcAddress(lib, sym);
+        if (retval == NULL) {
+            FreeLibrary(lib);
+        }
+    }
+    return retval;
 }
 
 #elif defined(__HAIKU__)
@@ -215,8 +222,11 @@
 {
     image_id lib = load_add_on(fname);
     void *retval = NULL;
-    if ((lib < 0) || (get_image_symbol(lib, sym, B_SYMBOL_TYPE_TEXT, &retval) != B_NO_ERROR)) {
-        retval = NULL;
+    if (lib >= 0) {
+        if (get_image_symbol(lib, sym, B_SYMBOL_TYPE_TEXT, &retval) != B_NO_ERROR) {
+            unload_add_on(lib);
+            retval = NULL;
+        }
     }
     return retval;
 }
@@ -225,7 +235,14 @@
 static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
 {
     void *lib = dlopen(fname, RTLD_NOW | RTLD_LOCAL);
-    return lib ? dlsym(lib, sym) : NULL;
+    void *retval = NULL;
+    if (lib != NULL) {
+        retval = dlsym(lib, sym);
+        if (retval == NULL) {
+            dlclose(lib);
+        }
+    }
+    return retval;
 }
 #else
 #error Please define your platform.