sceFontLib: Don't call the callback if double-free. Should fix one pa…

…rt of #6627
hrydgard · Mar 11, 2019 · 7865589 · 7865589
1 parent 335d257
commit 7865589
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp
@@ -436,7 +436,9 @@ class FontLib {
 		}
 		u32 args[2] = { params_.userDataAddr, (u32)handle_ };
 		// TODO: The return value of this is leaking.
-		__KernelDirectMipsCall(params_.freeFuncAddr, 0, args, 2, false);
+		if (handle_) {  // Avoid calling free-callback on double-free
+			__KernelDirectMipsCall(params_.freeFuncAddr, 0, args, 2, false);
+		}
 		handle_ = 0;
 		fonts_.clear();
 		isfontopen_.clear();