Skip to content

Fix crashes on any invalid json parsed by unity and bump dependencies #40

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

Merged
michael-r-elp merged 2 commits into from
Aug 28, 2025
Merged

Fix crashes on any invalid json parsed by unity and bump dependencies #40

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
9ffa9af
Fix crash from UnityEngine::JsonUtility::FromJson throwing on invalid…
FrozenAlex Aug 28, 2025
e77f9ea
Bump dependencies
FrozenAlex Aug 28, 2025
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
2 changes: 1 addition & 1 deletion qpm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
},
{
"id": "beatsaverplusplus",
"versionRange": "^0.2.2",
"versionRange": "^0.2.3",
"additionalData": {}
},
{
Expand Down
258 changes: 129 additions & 129 deletions qpm.shared.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
},
{
"id": "beatsaverplusplus",
"versionRange": "^0.2.2",
"versionRange": "^0.2.3",
"additionalData": {}
},
{
Expand All @@ -133,60 +133,102 @@
"restoredDependencies": [
{
"dependency": {
"id": "web-utils",
"versionRange": "=0.6.8",
"id": "sombrero",
"versionRange": "=0.1.43",
"additionalData": {
"soLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/libweb-utils.so",
"debugSoLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/debug_libweb-utils.so",
"overrideSoName": "libweb-utils.so",
"modLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/WebUtils.qmod",
"branchName": "version/v0_6_8",
"headersOnly": true,
"branchName": "version/v0_1_43"
}
},
"version": "0.1.43"
},
{
"dependency": {
"id": "beatsaverplusplus",
"versionRange": "=0.2.3",
"additionalData": {
"soLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.3/libbeatsaverplusplus.so",
"debugSoLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.3/debug_libbeatsaverplusplus.so",
"overrideSoName": "libbeatsaverplusplus.so",
"modLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.3/BeatSaverPlusPlus.qmod",
"branchName": "version/v0_2_3",
"cmake": false
}
},
"version": "0.6.8"
"version": "0.2.3"
},
{
"dependency": {
"id": "libil2cpp",
"versionRange": "=0.4.0",
"id": "bs-cordl",
"versionRange": "=4008.0.0",
"additionalData": {
"headersOnly": true,
"branchName": "version/v4008_0_0",
"compileOptions": {
"systemIncludes": [
"il2cpp/external/baselib/Include",
"il2cpp/external/baselib/Platforms/Android/Include"
"includePaths": [
"include"
],
"cppFeatures": [],
"cppFlags": [
"-DNEED_UNSAFE_CSHARP",
"-fdeclspec",
"-DUNITY_2021",
"-DHAS_CODEGEN",
"-Wno-invalid-offsetof"
]
}
}
},
"version": "0.4.0"
"version": "4008.0.0"
},
{
"dependency": {
"id": "bsml",
"versionRange": "=0.4.55",
"id": "lapiz",
"versionRange": "=0.2.23",
"additionalData": {
"soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/libbsml.so",
"debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/debug_libbsml.so",
"overrideSoName": "libbsml.so",
"modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/BSML.qmod",
"branchName": "version/v0_4_55",
"soLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/liblapiz.so",
"debugSoLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/debug_liblapiz.so",
"overrideSoName": "liblapiz.so",
"modLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/Lapiz.qmod",
"branchName": "version/v0_2_23",
"cmake": true
}
},
"version": "0.4.55"
"version": "0.2.23"
},
{
"dependency": {
"id": "sombrero",
"versionRange": "=0.1.43",
"id": "tinyxml2",
"versionRange": "=10.0.0",
"additionalData": {
"soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
"debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
"overrideSoName": "libtinyxml2.so",
"modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
"branchName": "version/v10_0_0",
"cmake": true
}
},
"version": "10.0.0"
},
{
"dependency": {
"id": "fmt",
"versionRange": "=11.0.2",
"additionalData": {
"headersOnly": true,
"branchName": "version/v0_1_43"
"branchName": "version/v11_0_2",
"compileOptions": {
"systemIncludes": [
"fmt/include/"
],
"cppFlags": [
"-DFMT_HEADER_ONLY"
]
}
}
},
"version": "0.1.43"
"version": "11.0.2"
},
{
"dependency": {
Expand All @@ -202,33 +244,47 @@
},
{
"dependency": {
"id": "songcore",
"versionRange": "=1.1.24",
"id": "web-utils",
"versionRange": "=0.6.8",
"additionalData": {
"soLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/libsongcore.so",
"debugSoLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/debug_libsongcore.so",
"overrideSoName": "libsongcore.so",
"modLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/SongCore.qmod",
"branchName": "version/v1_1_24",
"cmake": true
"soLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/libweb-utils.so",
"debugSoLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/debug_libweb-utils.so",
"overrideSoName": "libweb-utils.so",
"modLink": "https://github.com/bsq-ports/WebUtils/releases/download/v0.6.8/WebUtils.qmod",
"branchName": "version/v0_6_8",
"cmake": false
}
},
"version": "1.1.24"
"version": "0.6.8"
},
{
"dependency": {
"id": "tinyxml2",
"versionRange": "=10.0.0",
"id": "libil2cpp",
"versionRange": "=0.4.0",
"additionalData": {
"soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
"debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
"overrideSoName": "libtinyxml2.so",
"modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
"branchName": "version/v10_0_0",
"cmake": true
"headersOnly": true,
"compileOptions": {
"systemIncludes": [
"il2cpp/external/baselib/Include",
"il2cpp/external/baselib/Platforms/Android/Include"
]
}
}
},
"version": "10.0.0"
"version": "0.4.0"
},
{
"dependency": {
"id": "scotland2",
"versionRange": "=0.1.6",
"additionalData": {
"soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/libsl2.so",
"debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/debug_libsl2.so",
"overrideSoName": "libsl2.so",
"branchName": "version/v0_1_6"
}
},
"version": "0.1.6"
},
{
"dependency": {
Expand All @@ -247,25 +303,6 @@
},
"version": "0.1.9"
},
{
"dependency": {
"id": "paper2_scotland2",
"versionRange": "=4.6.4",
"additionalData": {
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/libpaper2_scotland2.so",
"overrideSoName": "libpaper2_scotland2.so",
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/paper2_scotland2.qmod",
"branchName": "version/v4_6_4",
"compileOptions": {
"systemIncludes": [
"shared/utfcpp/source"
]
},
"cmake": false
}
},
"version": "4.6.4"
},
{
"dependency": {
"id": "custom-types",
Expand All @@ -288,27 +325,22 @@
},
{
"dependency": {
"id": "bs-cordl",
"versionRange": "=4008.0.0",
"id": "paper2_scotland2",
"versionRange": "=4.6.4",
"additionalData": {
"headersOnly": true,
"branchName": "version/v4008_0_0",
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/libpaper2_scotland2.so",
"overrideSoName": "libpaper2_scotland2.so",
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v4.6.4/paper2_scotland2.qmod",
"branchName": "version/v4_6_4",
"compileOptions": {
"includePaths": [
"include"
],
"cppFeatures": [],
"cppFlags": [
"-DNEED_UNSAFE_CSHARP",
"-fdeclspec",
"-DUNITY_2021",
"-DHAS_CODEGEN",
"-Wno-invalid-offsetof"
"systemIncludes": [
"shared/utfcpp/source"
]
}
},
"cmake": false
}
},
"version": "4008.0.0"
"version": "4.6.4"
},
{
"dependency": {
Expand Down Expand Up @@ -343,65 +375,33 @@
},
{
"dependency": {
"id": "lapiz",
"versionRange": "=0.2.23",
"id": "songcore",
"versionRange": "=1.1.24",
"additionalData": {
"soLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/liblapiz.so",
"debugSoLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/debug_liblapiz.so",
"overrideSoName": "liblapiz.so",
"modLink": "https://github.com/raineaeternal/Lapiz/releases/download/v0.2.23/Lapiz.qmod",
"branchName": "version/v0_2_23",
"soLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/libsongcore.so",
"debugSoLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/debug_libsongcore.so",
"overrideSoName": "libsongcore.so",
"modLink": "https://github.com/raineaeternal/Quest-SongCore/releases/download/v1.1.24/SongCore.qmod",
"branchName": "version/v1_1_24",
"cmake": true
}
},
"version": "0.2.23"
},
{
"dependency": {
"id": "scotland2",
"versionRange": "=0.1.6",
"additionalData": {
"soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/libsl2.so",
"debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.6/debug_libsl2.so",
"overrideSoName": "libsl2.so",
"branchName": "version/v0_1_6"
}
},
"version": "0.1.6"
},
{
"dependency": {
"id": "beatsaverplusplus",
"versionRange": "=0.2.2",
"additionalData": {
"soLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.2/libbeatsaverplusplus.so",
"debugSoLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.2/debug_libbeatsaverplusplus.so",
"overrideSoName": "libbeatsaverplusplus.so",
"modLink": "https://github.com/bsq-ports/BeatSaverPlusPlus/releases/download/v0.2.2/BeatSaverPlusPlus.qmod",
"branchName": "version/v0_2_2",
"cmake": false
}
},
"version": "0.2.2"
"version": "1.1.24"
},
{
"dependency": {
"id": "fmt",
"versionRange": "=11.0.2",
"id": "bsml",
"versionRange": "=0.4.55",
"additionalData": {
"headersOnly": true,
"branchName": "version/v11_0_2",
"compileOptions": {
"systemIncludes": [
"fmt/include/"
],
"cppFlags": [
"-DFMT_HEADER_ONLY"
]
}
"soLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/libbsml.so",
"debugSoLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/debug_libbsml.so",
"overrideSoName": "libbsml.so",
"modLink": "https://github.com/bsq-ports/Quest-BSML/releases/download/v0.4.55/BSML.qmod",
"branchName": "version/v0_4_55",
"cmake": true
}
},
"version": "11.0.2"
"version": "0.4.55"
}
]
}
10 changes: 8 additions & 2 deletions src/Hooks/MultiplayerStatusModelHooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@ MAKE_AUTO_HOOK_FIND_VERBOSE(JsonUtility_FromJson_MultiplayerStatusData, getJsonU
return MultiplayerCore::Models::MpStatusData::New_ctor(value);
} else {
DEBUG("JsonUtility_FromJson_MultiplayerStatusData orig call");
// call orig here, remember to pass the info parameter to your orig call!
return JsonUtility_FromJson_MultiplayerStatusData(value, info);
try {
// call orig here, remember to pass the info parameter to your orig call!
return JsonUtility_FromJson_MultiplayerStatusData(value, info);
} catch (...) {
WARNING("JsonUtility_FromJson_MultiplayerStatusData exception caught, we have invalid json somewhere, printing backtrace for debugging...");
Paper::Logger::Backtrace(40);
return nullptr;
}
}
}