[vte] [ring] Remove one assertion



commit c621a6e8c4beffb2faf70404b843cf93def8cc1b
Author: Behdad Esfahbod <behdad behdad org>
Date:   Mon Oct 26 19:54:08 2009 -0400

    [ring] Remove one assertion
    
    Better dealing with corrupt history file, etc.

 src/ring.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/ring.c b/src/ring.c
index 3c0a0bb..84cd6a9 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -236,9 +236,13 @@ _vte_ring_thaw_row (VteRing *ring, gulong position, VteRowData *row, gboolean tr
 		p = q;
 
 		if (G_UNLIKELY (cell.attr.columns == 0)) {
-			/* Combine it */
-			g_assert (row->len);
-			row->cells[row->len - 1].c = _vte_unistr_append_unichar (row->cells[row->len - 1].c, cell.c);
+			if (G_LIKELY (row->len)) {
+				/* Combine it */
+				row->cells[row->len - 1].c = _vte_unistr_append_unichar (row->cells[row->len - 1].c, cell.c);
+			} else {
+				cell.attr.columns = 1;
+				_vte_row_data_append (row, &cell);
+			}
 		} else {
 			_vte_row_data_append (row, &cell);
 			if (cell.attr.columns > 1) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]