Merge pull request #13077 from unknownbrackets/savestate

SaveState: Make sure to default init net data
hrydgard · Jun 30, 2020 · 9aab3d9 · 9aab3d9
2 parents 1943722 + e6b42f3
commit 9aab3d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
@@ -778,11 +778,10 @@ class AfterMatchingMipsCall : public PSPAction {
 	}
 	void run(MipsCall &call) override;
 	void SetContextID(u32 ContextID, u32 eventId);
-	void SetContext(SceNetAdhocMatchingContext *Context, u32 eventId) { context = Context; EventID = eventId; }
 
 private:
-	u32 EventID;
-	SceNetAdhocMatchingContext *context;
+	u32 EventID = 0;
+	SceNetAdhocMatchingContext *context = nullptr;
 };
 
 extern int actionAfterMatchingMipsCall;

diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp
@@ -361,6 +361,8 @@ class PostAllocCallback : public PSPAction {
 		p.Do(fontLibID_);
 		if (s >= 2) {
 			p.Do(errorCodePtr_);
+		} else {
+			errorCodePtr_ = 0;
 		}
 	}
 	void run(MipsCall &call) override;
@@ -721,7 +723,8 @@ void PostAllocCallback::run(MipsCall &call) {
 	u32 v0 = currentMIPS->r[MIPS_REG_V0];
 	if (v0 == 0) {
 		// TODO: Who deletes fontLib?
-		Memory::Write_U32(ERROR_FONT_OUT_OF_MEMORY, errorCodePtr_);
+		if (errorCodePtr_)
+			Memory::Write_U32(ERROR_FONT_OUT_OF_MEMORY, errorCodePtr_);
 		call.setReturnValue(0);
 	} else {
 		FontLib *fontLib = fontLibList[fontLibID_];