Merge pull request #14092 from unknownbrackets/savestate

SaveState: Prevent crash on bad cookie marker
hrydgard · Feb 9, 2021 · 242e590 · 242e590
2 parents 8b101ae + 45f3f45
commit 242e590
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Common/Serialize/Serializer.cpp b/Common/Serialize/Serializer.cpp
@@ -174,7 +174,7 @@ void PointerWrap::DoMarker(const char *prevName, u32 arbitraryNumber) {
 	u32 cookie = arbitraryNumber;
 	Do(*this, cookie);
 	if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) {
-		_assert_msg_(false, "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load...", prevName, cookie, cookie, arbitraryNumber, arbitraryNumber);
+		ERROR_LOG(SAVESTATE, "Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting savestate load...", prevName, cookie, cookie, arbitraryNumber, arbitraryNumber);
 		SetError(ERROR_FAILURE);
 	}
 }