Reset the cached function handle if RPL has been unloaded

wiiu-env · Jan 2, 2023 · ac0c341 · ac0c341
1 parent e51e6a9
commit ac0c341
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/source/FunctionAddressProvider.cpp b/source/FunctionAddressProvider.cpp
@@ -67,3 +67,12 @@ function_replacement_library_type_t FunctionAddressProvider::getTypeForHandle(OS
     return LIBRARY_OTHER;
 }
 
+bool FunctionAddressProvider::resetHandle(OSDynLoad_Module handle) {
+    for (auto &rplHandle : rpl_handles) {
+        if (rplHandle.handle == handle) {
+            rplHandle.handle = nullptr;
+            return true;
+        }
+    }
+    return false;
+}
diff --git a/source/FunctionAddressProvider.h b/source/FunctionAddressProvider.h
@@ -18,6 +18,8 @@ class FunctionAddressProvider {
 
     function_replacement_library_type_t getTypeForHandle(OSDynLoad_Module toReset);
 
+    bool resetHandle(OSDynLoad_Module handle);
+
     std::list<rpl_handling> rpl_handles = {
             {LIBRARY_AVM, "avm.rpl", nullptr},
             {LIBRARY_CAMERA, "camera.rpl", nullptr},

diff --git a/source/main.cpp b/source/main.cpp
@@ -106,6 +106,7 @@ void notify_callback(OSDynLoad_Module module,
                 }
             }
         }
+        gFunctionAddressProvider->resetHandle(module);
         CheckIfPatchedFunctionsAreStillInMemory();
     }
 }