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

fix: Out of bounds memory read in hex editor with multi-byte visualizers

Browse Source
This commit is contained in:
WerWolv 2022-07-30 22:44:02 +02:00
parent 9ede1ab32c
commit 45ea22083e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@ -704,7 +704,7 @@ namespace hex::plugin::builtin {
const auto cellBytes = std::min<u64>(validBytes, bytesPerCell); const auto cellBytes = std::min<u64>(validBytes, bytesPerCell);
// Query cell colors // Query cell colors
if (x < validBytes) { if (x < validBytes / bytesPerCell) {
const auto foregroundColor = queryForegroundColor(byteAddress, &bytes[x * cellBytes], cellBytes); const auto foregroundColor = queryForegroundColor(byteAddress, &bytes[x * cellBytes], cellBytes);
const auto backgroundColor = [&]{ const auto backgroundColor = [&]{
auto color = queryBackgroundColor(byteAddress, &bytes[x * cellBytes], cellBytes); auto color = queryBackgroundColor(byteAddress, &bytes[x * cellBytes], cellBytes);
@ -740,7 +740,7 @@ namespace hex::plugin::builtin {
if (isColumnSeparatorColumn(x, columnCount)) if (isColumnSeparatorColumn(x, columnCount))
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (x < validBytes) { if (x < validBytes / bytesPerCell) {
auto cellStartPos = getCellPosition(); auto cellStartPos = getCellPosition();
auto cellSize = (CharacterSize * ImVec2(this->m_currDataVisualizer->getMaxCharsPerCell(), 1) + (ImVec2(3, 2) * ImGui::GetStyle().CellPadding) - ImVec2(1, 0) * ImGui::GetStyle().CellPadding) + ImVec2(1, 0); auto cellSize = (CharacterSize * ImVec2(this->m_currDataVisualizer->getMaxCharsPerCell(), 1) + (ImVec2(3, 2) * ImGui::GetStyle().CellPadding) - ImVec2(1, 0) * ImGui::GetStyle().CellPadding) + ImVec2(1, 0);
@ -860,7 +860,7 @@ namespace hex::plugin::builtin {
const auto x = address % this->m_bytesPerRow; const auto x = address % this->m_bytesPerRow;
if (x < validBytes) { if (x < validBytes / bytesPerCell) {
auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell]; auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];
// Draw highlights and selection // Draw highlights and selection