Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

patterns: Fix negative array sizes causing crashes

Browse Source
This commit is contained in:
WerWolv 2021-09-10 17:33:02 +02:00
parent b224a584fb
commit 717f78ce7f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/libimhex/source/pattern_language/evaluator.cpp
View File

@ -1021,7 +1021,7 @@ namespace hex::pl {
PatternData* Evaluator::evaluateStaticArray(ASTNodeArrayVariableDecl *node) { PatternData* Evaluator::evaluateStaticArray(ASTNodeArrayVariableDecl *node) {
std::optional<u32> color; std::optional<u32> color;
size_t arraySize = 0; ssize_t arraySize = 0;
auto startOffset = this->m_currOffset; auto startOffset = this->m_currOffset;
PatternData *templatePattern; PatternData *templatePattern;
@ -1076,6 +1076,9 @@ namespace hex::pl {
} }
} }
if (arraySize < 0)
this->getConsole().abortEvaluation("array size cannot be negative");
if (auto typeDecl = dynamic_cast<ASTNodeTypeDecl*>(node->getType()); typeDecl != nullptr) { if (auto typeDecl = dynamic_cast<ASTNodeTypeDecl*>(node->getType()); typeDecl != nullptr) {
if (auto builtinType = dynamic_cast<ASTNodeBuiltinType *>(typeDecl->getType()); builtinType != nullptr) { if (auto builtinType = dynamic_cast<ASTNodeBuiltinType *>(typeDecl->getType()); builtinType != nullptr) {
if (builtinType->getType() == Token::ValueType::Padding) if (builtinType->getType() == Token::ValueType::Padding)
@ -1143,9 +1146,12 @@ namespace hex::pl {
using Type = std::remove_cvref_t<decltype(value)>; using Type = std::remove_cvref_t<decltype(value)>;
if constexpr (std::is_floating_point_v<Type>) if constexpr (std::is_floating_point_v<Type>)
this->getConsole().abortEvaluation("bitfield entry size must be an integer value"); this->getConsole().abortEvaluation("bitfield entry size must be an integer value");
return static_cast<u64>(value); return static_cast<ssize_t>(value);
}, valueNode->getValue()); }, valueNode->getValue());
if (arraySize < 0)
this->getConsole().abortEvaluation("array size cannot be negative");
for (u64 i = 0; i < arraySize; i++) { for (u64 i = 0; i < arraySize; i++) {
addEntry(i); addEntry(i);
} }