rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crash when enum value is a symbol that not valid.

This commit is contained in:
Roy Qu 2023-08-07 18:28:30 +08:00
parent d1214e3d63
commit 30426ac58f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RedPandaIDE/parser/cppparser.cpp
View File

@ -1847,12 +1847,14 @@ int CppParser::evaluateConstExprTerm(int endIndex, bool &ok)
|| mTokenizer[mIndex]->text=="::") {
QString s = mTokenizer[mIndex]->text;
QSet<QString> searched;
bool isGlobal = false;
mIndex++;
if (s=="::") {
if (mIndex>=endIndex || !isIdentChar(mTokenizer[mIndex]->text[0])) {
ok=false;
return result;
}
isGlobal = true;
s+=mTokenizer[mIndex]->text;
mIndex++;
}
@ -1869,7 +1871,10 @@ int CppParser::evaluateConstExprTerm(int endIndex, bool &ok)
return result;
}
searched.insert(s);
PStatement statement = doFindStatement(s);
PStatement statement = doFindStatementOf(
mCurrentFile,s,
isGlobal?PStatement():getCurrentScope());
if (!statement) {
ok=false;
return result;
@ -1877,6 +1882,11 @@ int CppParser::evaluateConstExprTerm(int endIndex, bool &ok)
if (statement->kind == StatementKind::skEnum) {
result = statement->value.toInt(&ok);
break;
} else if (statement->kind == StatementKind::skAlias) {
s = statement->value;
} else {
ok=false;
return result;
}
}
} else {