summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Parrott <anthony@parrottsoft.com>2013-11-28 14:50:04 -0500
committerAnthony Parrott <anthony@parrottsoft.com>2013-11-28 14:50:04 -0500
commitc0c7037e18a7b4539f219c5fd8de30021d66c6d4 (patch)
tree14cadb08617404100c892fec6553a6152ba1ce7c
parentfec8c054c3967d9ed4bbf288b9c4993b8aaeac1d (diff)
downloadMultiMC-c0c7037e18a7b4539f219c5fd8de30021d66c6d4.tar
MultiMC-c0c7037e18a7b4539f219c5fd8de30021d66c6d4.tar.gz
MultiMC-c0c7037e18a7b4539f219c5fd8de30021d66c6d4.tar.lz
MultiMC-c0c7037e18a7b4539f219c5fd8de30021d66c6d4.tar.xz
MultiMC-c0c7037e18a7b4539f219c5fd8de30021d66c6d4.zip
Could reach end of rulesFromJsonV4 method without returning a QList
It was possible for execution to reach the end of the rulesFromJsonV4 method without returning. This was causing a crash on OS X when parsing rules inside an instance.
-rw-r--r--logic/OneSixRule.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/logic/OneSixRule.cpp b/logic/OneSixRule.cpp
index d35be720..392b1dd1 100644
--- a/logic/OneSixRule.cpp
+++ b/logic/OneSixRule.cpp
@@ -56,6 +56,7 @@ QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules)
// add a new OS rule
rules.append(OsRule::create(action, requiredOs, versionRegex));
}
+ return rules;
}
QJsonObject ImplicitRule::toJson()