RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:18:11 +00:00
Code Issues Activity Actions

LibGUI: Don't update cursor, if visual data out-of-date

Browse source 
This fixes https://github.com/SerenityOS/serenity/issues/2498
A nullptr dereference was caused by the visual data beeing out of sync
with the line data, due to a deferred recompute.
This commit is contained in:
Kevin Meyer 2020-06-13 00:31:46 +02:00 • committed by Andreas Kling
parent e0f4fdc9b4
commit 17aa917073
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Libraries/LibGUI/TextEditor.cpp
View file

@ -1075,7 +1075,7 @@ void TextEditor::set_cursor(const TextPosition& a_position)
if (position.column() > lines()[position.line()].length()) if (position.column() > lines()[position.line()].length())
position.set_column(lines()[position.line()].length()); position.set_column(lines()[position.line()].length());
if (m_cursor != position) { if (m_cursor != position && is_visual_data_up_to_date()) {
// NOTE: If the old cursor is no longer valid, repaint everything just in case. // NOTE: If the old cursor is no longer valid, repaint everything just in case.
auto old_cursor_line_rect = m_cursor.line() < line_count() auto old_cursor_line_rect = m_cursor.line() < line_count()
? line_widget_rect(m_cursor.line()) ? line_widget_rect(m_cursor.line())
@ -1085,6 +1085,9 @@ void TextEditor::set_cursor(const TextPosition& a_position)
scroll_cursor_into_view(); scroll_cursor_into_view();
update(old_cursor_line_rect); update(old_cursor_line_rect);
update_cursor(); update_cursor();
} else if (m_cursor != position) {
m_cursor = position;
m_cursor_state = true;
} }
cursor_did_change(); cursor_did_change();
if (on_cursor_change) if (on_cursor_change)
@ -1387,6 +1390,8 @@ void TextEditor::recompute_all_visual_lines()
return; return;
} }
m_reflow_requested = false;
int y_offset = 0; int y_offset = 0;
for (size_t line_index = 0; line_index < line_count(); ++line_index) { for (size_t line_index = 0; line_index < line_count(); ++line_index) {
recompute_visual_lines(line_index); recompute_visual_lines(line_index);

4
Libraries/LibGUI/TextEditor.h
View file

@ -259,7 +259,9 @@ private:
NonnullRefPtrVector<Action> m_custom_context_menu_actions; NonnullRefPtrVector<Action> m_custom_context_menu_actions;
size_t m_reflow_deferred { 0 }; size_t m_reflow_deferred { 0 };
size_t m_reflow_requested { 0 }; bool m_reflow_requested { false };
bool is_visual_data_up_to_date() const { return !m_reflow_requested; }
RefPtr<TextDocument> m_document; RefPtr<TextDocument> m_document;