vte r2275 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Mon Dec  1 23:50:02 2008
New Revision: 2275
URL: http://svn.gnome.org/viewvc/vte?rev=2275&view=rev

Log:
2008-12-01  Behdad Esfahbod  <behdad gnome org>

        Bug 562806 â crash in Terminal: Typing "cd " just after ...

        * src/vte.c (_vte_terminal_cleanup_tab_fragments_at_cursor):
        Fix possible NULL dereference.

        * src/vteseq.c (vte_sequence_handler_ta):
        Fix tab fragments to have \t as c.



Modified:
   trunk/ChangeLog
   trunk/src/vte.c
   trunk/src/vteseq.c

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Mon Dec  1 23:50:02 2008
@@ -2956,7 +2956,6 @@
 		_vte_debug_print(VTE_DEBUG_MISC,
 				 "Cleaning tab fragments at %ld",
 				 col);
-		g_message ("cleaning tab at %ld", col);
 
 		/* go back to the beginning of the tab */
 		while (cell != NULL && cell->attr.fragment && col > 0) {
@@ -2971,6 +2970,8 @@
 		num_columns = cell->attr.columns;
 		for (i = 0; i < num_columns; i++) {
 			cell = _vte_row_data_find_charcell(row, col++);
+			if (!cell)
+				break;
 			*cell = screen->fill_defaults;
 		}
 	}

Modified: trunk/src/vteseq.c
==============================================================================
--- trunk/src/vteseq.c	(original)
+++ trunk/src/vteseq.c	Mon Dec  1 23:50:02 2008
@@ -2162,7 +2162,7 @@
 		    cell.c = '\t';
 		    g_array_append_vals(rowdata->cells, &cell, 1);
 
-		    cell = screen->fill_defaults;
+		    cell.attr = screen->fill_defaults.attr;
 		    cell.attr.fragment = 1;
 		    vte_g_array_fill (rowdata->cells,
 				      &cell,