beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

VimEditingEngine: Prevent crash upon 'x' or 'v' on blank lines

Browse source 
Previously, pressing 'x' for deletion on an otherwise empty line
insinuated a crash in TextEditor because a nonexistent code point was
accessed -- likewise for visual mode.
This commit is contained in:
Ariel Don 2021-07-17 21:05:03 -05:00 committed by Gunnar Beutner
parent 79745507a9
commit a4fdb7f029
Notes: sideshowbarker 2024-07-18 08:37:53 +09:00 
Author: https://github.com/arieldon
Commit: https://github.com/SerenityOS/serenity/commit/a4fdb7f0296
Pull-request: https://github.com/SerenityOS/serenity/pull/8848
Issue: https://github.com/SerenityOS/serenity/issues/8769
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibGUI/TextDocument.cpp
View file

@ -350,7 +350,14 @@ String TextDocument::text_in_range(const TextRange& a_range) const
auto& line = this->line(i);
size_t selection_start_column_on_line = range.start().line() == i ? range.start().column() : 0;
size_t selection_end_column_on_line = range.end().line() == i ? range.end().column() : line.length();
builder.append(Utf32View(line.code_points() + selection_start_column_on_line, selection_end_column_on_line - selection_start_column_on_line));
if (!line.is_empty()) {
builder.append(
Utf32View(
line.code_points() + selection_start_column_on_line,
selection_end_column_on_line - selection_start_column_on_line));
}
if (i != range.end().line())
builder.append('\n');
}
@ -925,12 +932,16 @@ void TextDocument::remove(const TextRange& unnormalized_range)
} else {
// Delete across a newline, merging lines.
VERIFY(range.start().line() == range.end().line() - 1);
auto& first_line = line(range.start().line());
auto& second_line = line(range.end().line());
Vector<u32> code_points;
code_points.append(first_line.code_points(), range.start().column());
code_points.append(second_line.code_points() + range.end().column(), second_line.length() - range.end().column());
if (!second_line.is_empty())
code_points.append(second_line.code_points() + range.end().column(), second_line.length() - range.end().column());
first_line.set_text(*this, move(code_points));
remove_line(range.end().line());
}