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

patterns: Fix local variables holding larger values than allowed

Browse Source
This commit is contained in:
WerWolv 2022-01-12 08:59:14 +01:00
parent d399a6427a
commit 6b20a9bdd5
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/libimhex/include/hex/helpers/utils.hpp
View File

@ -115,6 +115,11 @@ namespace hex {
return result; return result;
} }
[[nodiscard]]
constexpr uint64_t bitmask(uint8_t bits) {
return (uint64_t(1) << (bits)) - 1;
}
template<typename T> template<typename T>
constexpr T changeEndianess(T value, size_t size, std::endian endian) { constexpr T changeEndianess(T value, size_t size, std::endian endian) {
if (endian == std::endian::native) if (endian == std::endian::native)

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

@ -81,11 +81,11 @@ namespace hex::pl {
Token::Literal castedLiteral = std::visit(overloaded { Token::Literal castedLiteral = std::visit(overloaded {
[&](double &value) -> Token::Literal { [&](double &value) -> Token::Literal {
if (dynamic_cast<PatternDataUnsigned*>(pattern)) if (dynamic_cast<PatternDataUnsigned*>(pattern))
return u128(value); return u128(value) & bitmask(pattern->getSize() * 8);
else if (dynamic_cast<PatternDataSigned*>(pattern)) else if (dynamic_cast<PatternDataSigned*>(pattern))
return s128(value); return s128(value) & bitmask(pattern->getSize() * 8);
else if (dynamic_cast<PatternDataFloat*>(pattern)) else if (dynamic_cast<PatternDataFloat*>(pattern))
return value; return pattern->getSize() == sizeof(float) ? double(float(value)) : value;
else else
LogConsole::abortEvaluation(hex::format("cannot cast type 'double' to type '{}'", pattern->getTypeName())); LogConsole::abortEvaluation(hex::format("cannot cast type 'double' to type '{}'", pattern->getTypeName()));
}, },
@ -103,15 +103,15 @@ namespace hex::pl {
}, },
[&](auto &&value) -> Token::Literal { [&](auto &&value) -> Token::Literal {
if (dynamic_cast<PatternDataUnsigned*>(pattern) || dynamic_cast<PatternDataEnum*>(pattern)) if (dynamic_cast<PatternDataUnsigned*>(pattern) || dynamic_cast<PatternDataEnum*>(pattern))
return u128(value); return u128(value) & bitmask(pattern->getSize() * 8);
else if (dynamic_cast<PatternDataSigned*>(pattern)) else if (dynamic_cast<PatternDataSigned*>(pattern))
return s128(value); return s128(value) & bitmask(pattern->getSize() * 8);
else if (dynamic_cast<PatternDataCharacter*>(pattern)) else if (dynamic_cast<PatternDataCharacter*>(pattern))
return char(value); return char(value);
else if (dynamic_cast<PatternDataBoolean*>(pattern)) else if (dynamic_cast<PatternDataBoolean*>(pattern))
return bool(value); return bool(value);
else if (dynamic_cast<PatternDataFloat*>(pattern)) else if (dynamic_cast<PatternDataFloat*>(pattern))
return double(value); return pattern->getSize() == sizeof(float) ? double(float(value)) : value;
else else
LogConsole::abortEvaluation(hex::format("cannot cast integer literal to type '{}'", pattern->getTypeName())); LogConsole::abortEvaluation(hex::format("cannot cast integer literal to type '{}'", pattern->getTypeName()));
} }