RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 15:57:34 +00:00
Code Issues Activity Actions

HexEditor: Fix off-by-one bugs in selected text length calculations

Browse source 
find_and_highlight() selected +1 too many bytes.

'Select All' selected +1 too many bytes past the end of
the buffer.

Status bar 'Selected Bytes' count was off by -1 when more
than zero bytes were selected.
This commit is contained in:
Brendan Coles 2021-06-01 07:48:59 +00:00 • committed by Andreas Kling
parent 2e23954271
commit 996f69a1b2
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Applications/HexEditor/HexEditor.cpp
View file

@ -113,6 +113,13 @@ bool HexEditor::write_to_file(const String& path)
return true;
}
size_t HexEditor::selection_size()
{
if (!has_selection())
return 0;
return abs(m_selection_end - m_selection_start) + 1;
}
bool HexEditor::copy_selected_hex_to_clipboard()
{
if (!has_selection())
@ -561,7 +568,7 @@ void HexEditor::paint_event(GUI::PaintEvent& event)
void HexEditor::select_all()
{
highlight(0, m_buffer.size());
highlight(0, m_buffer.size() - 1);
set_position(0);
}
@ -575,7 +582,7 @@ void HexEditor::highlight(int start, int end)
int HexEditor::find_and_highlight(ByteBuffer& needle, int start)
{
auto end_of_match = find(needle, start);
highlight(end_of_match - needle.size(), end_of_match);
highlight(end_of_match - needle.size(), end_of_match - 1);
return end_of_match;
}

1
Userland/Applications/HexEditor/HexEditor.h
View file

@ -37,6 +37,7 @@ public:
void select_all();
bool has_selection() const { return !(m_selection_start == -1 || m_selection_end == -1 || (m_selection_end - m_selection_start) < 0 || m_buffer.is_empty()); }
size_t selection_size();
int selection_start_offset() const { return m_selection_start; }
bool copy_selected_text_to_clipboard();
bool copy_selected_hex_to_clipboard();

2
Userland/Applications/HexEditor/HexEditorWidget.cpp
View file

@ -51,7 +51,7 @@ HexEditorWidget::HexEditorWidget()
m_statusbar->set_text(1, String::formatted("Edit Mode: {}", edit_mode == HexEditor::EditMode::Hex ? "Hex" : "Text"));
m_statusbar->set_text(2, String::formatted("Selection Start: {}", selection_start));
m_statusbar->set_text(3, String::formatted("Selection End: {}", selection_end));
m_statusbar->set_text(4, String::formatted("Selected Bytes: {}", abs(selection_end - selection_start)));
m_statusbar->set_text(4, String::formatted("Selected Bytes: {}", m_editor->selection_size()));
};
m_editor->on_change = [this] {