Merge pull request #4229 from Janrupf/develop

GH-4227 Don't crash when mods.toml is invalid

1 files changed, 11 insertions, 0 deletions

diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp
index 0d6972fb..8ac5885f 100644
--- a/launcher/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/LocalModParseTask.cpp
@@ -107,8 +107,19 @@ std::shared_ptr<ModDetails> ReadMCModTOML(QByteArray contents)
 
     // array defined by [[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
     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]]
     toml_datum_t modIdDatum = toml_string_in(tomlModsTable0, "modId");