summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibVT
diff options
context:
space:
mode:
authorMacDue <macdue@dueutil.tech>2022-02-27 22:04:02 +0000
committerAndreas Kling <kling@serenityos.org>2022-02-28 10:29:48 +0100
commit8b2025d8fcca595946848fa88ad64e2f79218933 (patch)
tree4b09e1e57bd0d148faafe97727dc9455f6690472 /Userland/Libraries/LibVT
parent0d0e5323dd5a44f352b1a452a6677d8db5d27406 (diff)
downloadserenity-8b2025d8fcca595946848fa88ad64e2f79218933.zip
LibVT: Fix crash from integer overflow in text wrapping
Fixes #12786
Diffstat (limited to 'Userland/Libraries/LibVT')
-rw-r--r--Userland/Libraries/LibVT/Line.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Userland/Libraries/LibVT/Line.cpp b/Userland/Libraries/LibVT/Line.cpp
index f1c817b82f..721684f428 100644
--- a/Userland/Libraries/LibVT/Line.cpp
+++ b/Userland/Libraries/LibVT/Line.cpp
@@ -28,7 +28,7 @@ void Line::rewrap(size_t new_length, Line* next_line, CursorPosition* cursor, bo
m_cells.remove(m_terminated_at.value(), m_cells.size() - m_terminated_at.value());
if (!next_line)
- return m_cells.resize(new_length);
+ return set_length(new_length);
if (old_length < new_length)
take_cells_from_next_line(new_length, next_line, cursor_is_on_next_line, cursor);
@@ -39,6 +39,8 @@ void Line::rewrap(size_t new_length, Line* next_line, CursorPosition* cursor, bo
void Line::set_length(size_t new_length)
{
m_cells.resize(new_length);
+ if (m_terminated_at.has_value())
+ m_terminated_at = min(*m_terminated_at, new_length);
}
void Line::push_cells_into_next_line(size_t new_length, Line* next_line, bool cursor_is_on_next_line, CursorPosition* cursor)
@@ -92,7 +94,7 @@ void Line::take_cells_from_next_line(size_t new_length, Line* next_line, bool cu
auto cells_to_grab_from_next_line = min(new_length - length(), next_line->length());
auto clear_next_line = false;
if (next_line->m_terminated_at.has_value()) {
- if (cells_to_grab_from_next_line == *next_line->m_terminated_at) {
+ if (cells_to_grab_from_next_line >= *next_line->m_terminated_at) {
m_terminated_at = length() + *next_line->m_terminated_at;
next_line->m_terminated_at.clear();
clear_next_line = true;