Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-28 17:40:51 +01:00
Code Releases Wiki Activity

fix: More vector out of bounds accesses

Browse Source
This commit is contained in:
WerWolv 2022-06-14 10:17:50 +02:00
parent 141ee62af9
commit 1e511acf37
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -754,21 +754,21 @@ namespace hex::plugin::builtin {
const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true);
this->handleSelection(byteAddress, bytesPerCell, &bytes[x], cellHovered);
auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];
// Draw highlights and selection
if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList();
// Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
this->drawSelectionFrame(x, y, byteAddress, 1, cellStartPos, cellSize);
}
if (x < validBytes) {
this->handleSelection(byteAddress, bytesPerCell, &bytes[x], cellHovered);
auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];
// Draw highlights and selection
if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList();
// Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
this->drawSelectionFrame(x, y, byteAddress, 1, cellStartPos, cellSize);
}
if (std::isprint(bytes[x]))
ImGui::TextFormatted("{:c}", bytes[x]);
else
@ -808,21 +808,24 @@ namespace hex::plugin::builtin {
const auto cellSize = CharacterSize * data.advance;
const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true);
auto [foregroundColor, backgroundColor] = cellColors[address % this->m_bytesPerRow];
const auto x = address % this->m_bytesPerRow;
if (x < validBytes) {
auto [foregroundColor, backgroundColor] = cellColors[x];
// Draw highlights and selection
if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList();
// Draw highlights and selection
if (backgroundColor.has_value()) {
auto drawList = ImGui::GetWindowDrawList();
// Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
// Draw background color
drawList->AddRectFilled(cellStartPos, cellStartPos + cellSize, backgroundColor.value());
this->drawSelectionFrame(address % this->m_bytesPerRow, y, address, 1, cellStartPos, cellSize);
this->drawSelectionFrame(x, y, address, 1, cellStartPos, cellSize);
}
ImGui::TextFormattedColored(data.color, "{}", data.displayValue);
this->handleSelection(address, data.advance, &bytes[address % this->m_bytesPerRow], cellHovered);
}
ImGui::TextFormattedColored(data.color, "{}", data.displayValue);
this->handleSelection(address, data.advance, &bytes[address % this->m_bytesPerRow], cellHovered);
}
ImGui::EndTable();