diff --git a/ChangeLog b/ChangeLog index 01ee421a42..37002e8f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 01ee421a42..37002e8f17 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 01ee421a42..37002e8f17 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 01ee421a42..37002e8f17 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 01ee421a42..37002e8f17 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 01ee421a42..37002e8f17 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 01ee421a42..37002e8f17 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextbtree.c (_gtk_text_btree_insert): add assertion that + #58290 would trigger if it reappeared, I think + 2001-10-22 Havoc Pennington * gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment): diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 2f03b58079..44cf702c3c 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -942,8 +942,8 @@ _gtk_text_btree_delete (GtkTextIter *start, void _gtk_text_btree_insert (GtkTextIter *iter, - const gchar *text, - gint len) + const gchar *text, + gint len) { GtkTextLineSegment *prev_seg; /* The segment just before the first * new segment (NULL means new segment @@ -980,10 +980,15 @@ _gtk_text_btree_insert (GtkTextIter *iter, /* extract iterator info */ tree = _gtk_text_iter_get_btree (iter); line = _gtk_text_iter_get_text_line (iter); + start_line = line; start_byte_index = gtk_text_iter_get_line_index (iter); - /* Get our insertion segment split */ + /* Get our insertion segment split. Note this assumes line allows + * char insertions, which isn't true of the "last" line. But iter + * should not be on that line, as we assert here. + */ + g_assert (!_gtk_text_line_is_last (line, tree)); prev_seg = gtk_text_line_segment_split (iter); cur_seg = prev_seg;