atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash parsing C defines from unknown token

Browse source
This commit is contained in:
GriffinR 2020-06-04 13:28:51 -04:00 committed by huderlem
parent 32726d4a6a
commit c382190e8b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/parseutil.cpp
View file

@ -226,8 +226,7 @@ int ParseUtil::evaluatePostfix(QList<Token> postfix) {
stack.push(token); stack.push(token);
} // else ignore errored tokens, we have already warned the user. } // else ignore errored tokens, we have already warned the user.
} }
return stack.size() ? stack.pop().value.toInt(nullptr, 0) : 0;
return stack.pop().value.toInt(nullptr, 0);
} }
QString ParseUtil::readCIncbin(QString filename, QString label) { QString ParseUtil::readCIncbin(QString filename, QString label) {
@ -273,6 +272,8 @@ QMap<QString, int> ParseUtil::readCDefines(QString filename, QStringList prefixe
text.replace(QRegularExpression("(//.*)|(\\/+\\*+[^*]*\\*+\\/+)"), ""); text.replace(QRegularExpression("(//.*)|(\\/+\\*+[^*]*\\*+\\/+)"), "");
text.replace(QRegularExpression("(\\\\\\s+)"), ""); text.replace(QRegularExpression("(\\\\\\s+)"), "");
allDefines.insert("FALSE", 0);
allDefines.insert("TRUE", 1);
QRegularExpression re("#define\\s+(?<defineName>\\w+)[^\\S\\n]+(?<defineValue>.+)"); QRegularExpression re("#define\\s+(?<defineName>\\w+)[^\\S\\n]+(?<defineValue>.+)");
QRegularExpressionMatchIterator iter = re.globalMatch(text); QRegularExpressionMatchIterator iter = re.globalMatch(text);