Skip to content

Commit 3e1dfb6

Browse files
Merge pull request #41 from FrozenAlex/json-fix-2
Catch JsonConvert_DeserializeObject exceptions too
2 parents ad4006e + 9bac29d commit 3e1dfb6

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

src/Hooks/MultiplayerStatusModelHooks.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@ MAKE_AUTO_HOOK_FIND_VERBOSE(JsonConvert_DeserializeObject_MultiplayerStatusData,
2828
return MultiplayerCore::Models::MpStatusData::New_ctor(value);
2929
} else {
3030
DEBUG("JsonConvert_DeserializeObject_MultiplayerStatusData orig call");
31-
// call orig here, remember to pass the info parameter to your orig call!
32-
return JsonConvert_DeserializeObject_MultiplayerStatusData(value, info);
31+
try {
32+
// call orig here, remember to pass the info parameter to your orig call!
33+
return JsonConvert_DeserializeObject_MultiplayerStatusData(value, info);
34+
} catch (...) {
35+
WARNING("JsonConvert_DeserializeObject_MultiplayerStatusData exception caught, we have invalid json somewhere, printing backtrace for debugging...");
36+
Paper::Logger::Backtrace(40);
37+
return nullptr;
38+
}
3339
}
3440
}
3541

0 commit comments

Comments
 (0)