bridgehook: add NULL support to MSFindSymbol

palera1n · Jul 16, 2024 · 6a387c0 · 6a387c0
1 parent 1e7e9b7
commit 6a387c0
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/src/bridgehook/main.c b/src/bridgehook/main.c
@@ -51,23 +51,31 @@ MSImageRef MSGetImageByName(const char *file) {
 }
 
 BH_EXPORT
-void MSCloseImage(const char* file) {
+void MSCloseImage(__unused const char* file) {
     return;
 }
 
 BH_EXPORT
 void *MSFindSymbol(MSImageRef image, const char *name) {
-    uint32_t file_index = 0;
-    for (uint32_t i = 0; i < _dyld_image_count(); i++) {
-        if (image == _dyld_get_image_header(i)) {
-            file_index = i;
-            break;
+    if (image) {
+        uint32_t file_index = 0;
+        for (uint32_t i = 0; i < _dyld_image_count(); i++) {
+            if (image == _dyld_get_image_header(i)) {
+                file_index = i;
+                break;
+            }
+        }
+        if (file_index)
+            return DobbySymbolResolver(_dyld_get_image_name(file_index), name);
+        else
+            return NULL;
+    } else {
+        for (uint32_t i = 0; i < _dyld_image_count(); i++) {
+            void* sym = DobbySymbolResolver(_dyld_get_image_name(i), name);
+            if (sym) return sym;
         }
-    }
-    if (file_index)
-        return DobbySymbolResolver(_dyld_get_image_name(file_index), name);
-    else
         return NULL;
+    }
 }
 
 BH_EXPORT