Handle a failed backtrace call (fix #79)

Dadoum · Jul 2, 2023 · c5e5f97 · c5e5f97
1 parent b131c62
commit c5e5f97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/cmake/cmake-d b/cmake/cmake-d
diff --git a/lib/provision/androidlibrary.d b/lib/provision/androidlibrary.d
@@ -252,6 +252,7 @@ AndroidLibrary memoryOwner(size_t address) {
         }
     }
 
+    getLogger().error("Cannot find the parent library! Expect bugs!");
     return null;
 }
 

diff --git a/lib/provision/symbols.d b/lib/provision/symbols.d
@@ -47,8 +47,13 @@ private extern (C) AndroidLibrary dlopenWrapper(const char* name) {
     }
     try {
         auto caller = rootLibrary();
-        auto lib = new AndroidLibrary(cast(string) name.fromStringz(), caller.hooks);
-        caller.loadedLibraries ~= lib;
+        AndroidLibrary lib;
+        if (caller) {
+            lib = new AndroidLibrary(cast(string) name.fromStringz(), caller.hooks);
+            caller.loadedLibraries ~= lib;
+        } else {
+            lib = new AndroidLibrary(cast(string) name.fromStringz());
+        }
         return lib;
     } catch (Throwable) {
         return null;
@@ -64,7 +69,10 @@ private extern (C) void* dlsymWrapper(AndroidLibrary library, const char* symbol
 
 private extern (C) void dlcloseWrapper(AndroidLibrary library) {
     if (library) {
-        rootLibrary().loadedLibraries.remove!((lib) => lib == library);
+        auto caller = rootLibrary();
+        if (caller) {
+            rootLibrary().loadedLibraries.remove!((lib) => lib == library);
+        }
         destroy(library);
     }
 }