Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SaveState: Make sure to default init net data #13077

Merged
merged 2 commits into from
Jun 30, 2020
Merged

SaveState: Make sure to default init net data #13077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20dd7db
SaveState: Make sure to default init net data.
unknownbrackets Jun 30, 2020
e6b42f3
SaveState: Prevent edge case on old save state.
unknownbrackets Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Core/HLE/proAdhoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion Core/HLE/sceFont.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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_];
Expand Down