Solve undefined behavior in VMT hooker destructor

Northn · Jun 4, 2021 · 23e26b5 · 23e26b5
1 parent 59af0a0
commit 23e26b5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/libs/rtdhook/rtdhook.hpp b/src/libs/rtdhook/rtdhook.hpp
@@ -134,9 +134,10 @@ class rtdhook_vmt {
 	 */
 	~rtdhook_vmt()
 	{
-		for (auto& method : mHookedList)
+		for (auto ptr = mHookedList.begin(); ptr < mHookedList.end();)
 		{
-			uninstall(method.id);
+			rewrite_pointer(ptr->id, ptr->original);
+			ptr = mHookedList.erase(ptr);
 		}
 	}