Fix sixel crash when buffer is reflowed.

j4james · Sep 22, 2024 · 8ed4cc0 · 8ed4cc0
1 parent a7e47b7
commit 8ed4cc0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/terminal/adapter/SixelParser.cpp b/src/terminal/adapter/SixelParser.cpp
@@ -715,8 +715,16 @@ void SixelParser::_eraseImageBufferRows(const int rowCount, const til::CoordType
     const auto pixelCount = rowCount * _cellSize.height;
     const auto bufferOffset = rowOffset * _cellSize.height * _imageMaxWidth;
     const auto bufferOffsetEnd = bufferOffset + pixelCount * _imageMaxWidth;
-    _imageBuffer.erase(_imageBuffer.begin() + bufferOffset, _imageBuffer.begin() + bufferOffsetEnd);
-    _imageCursor.y -= pixelCount;
+    if (bufferOffsetEnd >= _imageBuffer.size()) [[unlikely]]
+    {
+        _imageBuffer.clear();
+        _imageCursor.y = 0;
+    }
+    else
+    {
+        _imageBuffer.erase(_imageBuffer.begin() + bufferOffset, _imageBuffer.begin() + bufferOffsetEnd);
+        _imageCursor.y -= pixelCount;
+    }
 }
 
 void SixelParser::_maybeFlushImageBuffer(const bool endOfSequence)