imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 13:05:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed enum parse/evaluate error and crash

Browse Source
This commit is contained in:
WerWolv
2021-01-10 17:14:38 +01:00
parent c71c610eba
commit ad40c53eb2
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/lang/evaluator.cpp
View File

@@ -440,13 +440,17 @@ namespace hex::lang {
entryPatterns.push_back({{ valueNode->getType(), valueNode->getValue() }, name });
}
auto underlyingType = dynamic_cast<ASTNodeTypeDecl*>(node->getUnderlyingType());
if (underlyingType == nullptr)
throwEvaluateError("enum underlying type was not ASTNodeTypeDecl. This is a bug");
size_t size;
if (auto underlyingType = dynamic_cast<const ASTNodeBuiltinType*>(node->getUnderlyingType()); underlyingType != nullptr)
size = Token::getTypeSize(underlyingType->getType());
if (auto builtinType = dynamic_cast<ASTNodeBuiltinType*>(underlyingType->getType()); builtinType != nullptr)
size = Token::getTypeSize(builtinType->getType());
else
throwEvaluateError("invalid enum underlying type");
return new PatternDataEnum(startOffset, size, entryPatterns);
return new PatternDataEnum(startOffset, size, entryPatterns);;
}
PatternData* Evaluator::evaluateBitfield(ASTNodeBitfield *node) {
@@ -711,7 +715,7 @@ namespace hex::lang {
delete result;
}
this->m_endianStack.pop_back();
this->m_endianStack.clear();
}
} catch (EvaluateError &e) {
this->m_consoleLog.emplace_back(ConsoleLogLevel::Error, e);