mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2025-01-15 19:51:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4229 from Janrupf/develop

Browse Source 
GH-4227 Don't crash when mods.toml is invalid
This commit is contained in:
Petr Mrázek 2021-11-06 23:07:23 +01:00 committed by GitHub
commit 30602363d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ tags
branding/ branding/
secrets/ secrets/
run/

11
launcher/minecraft/mod/LocalModParseTask.cpp
View File

@ -107,8 +107,19 @@ std::shared_ptr<ModDetails> ReadMCModTOML(QByteArray contents)
// array defined by [[mods]] // array defined by [[mods]]
toml_array_t* tomlModsArr = toml_array_in(tomlData, "mods"); toml_array_t* tomlModsArr = toml_array_in(tomlData, "mods");
if(!tomlModsArr)
{
qWarning() << "Corrupted mods.toml? Couldn't find [[mods]] array!";
return nullptr;
}
// we only really care about the first element, since multiple mods in one file is not supported by us at the moment // we only really care about the first element, since multiple mods in one file is not supported by us at the moment
toml_table_t* tomlModsTable0 = toml_table_at(tomlModsArr, 0); toml_table_t* tomlModsTable0 = toml_table_at(tomlModsArr, 0);
if(!tomlModsTable0)
{
qWarning() << "Corrupted mods.toml? [[mods]] didn't have an element at index 0!";
return nullptr;
}
// mandatory properties - always in [[mods]] // mandatory properties - always in [[mods]]
toml_datum_t modIdDatum = toml_string_in(tomlModsTable0, "modId"); toml_datum_t modIdDatum = toml_string_in(tomlModsTable0, "modId");