avoid memory corruption (#357050).

2006-11-07  Paolo Borelli  <pborelli@katamail.com>

	* gtk/gtktextbtree.c (_gtk_text_btree_delete): avoid memory
	corruption (#357050).

diff --git a/ChangeLog b/ChangeLog
index 3f74b32ab6fede20f6a47e4db44a8967253bd0a0..9658f3bfb709340d759a14e3003bd8e877451fef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-07  Paolo Borelli  <pborelli@katamail.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_delete): avoid memory
+       corruption (#357050).
+
 2006-11-06  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkdnd.c: (gtk_drag_begin_internal),

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 30b5d5cd850a1b578f258e385b7ffa2473a558da..d8e436d74a7a0f5e5d553e1b08917853dfd9666a 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -886,6 +886,7 @@ _gtk_text_btree_delete (GtkTextIter *start,
               start_line->segments = seg;
             }
           else if (prev_seg->next &&
+                  prev_seg->next != last_seg &&
                   seg->type == &gtk_text_toggle_off_type &&
                   prev_seg->next->type == &gtk_text_toggle_on_type &&
                   seg->body.toggle.info == prev_seg->next->body.toggle.info)