From b98e17c85088757547a38268818597eaf03028ef Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 4 Jul 2004 05:12:47 +0000 Subject: [PATCH] Don't crash if somebody tries to move a node after itself in a list of Sun Jul 4 01:11:07 2004 Matthias Clasen * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if somebody tries to move a node after itself in a list of length 1. (#145291, Sampo Nurmentaus) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreestore.c | 3 ++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 901dbaba48..d88bba1074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jul 4 01:11:07 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if + somebody tries to move a node after itself in a list of + length 1. (#145291, Sampo Nurmentaus) + Sat Jul 3 23:43:23 2004 Matthias Clasen * docs/faq/gtk-faq.sgml: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 901dbaba48..d88bba1074 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Jul 4 01:11:07 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if + somebody tries to move a node after itself in a list of + length 1. (#145291, Sampo Nurmentaus) + Sat Jul 3 23:43:23 2004 Matthias Clasen * docs/faq/gtk-faq.sgml: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 901dbaba48..d88bba1074 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Jul 4 01:11:07 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if + somebody tries to move a node after itself in a list of + length 1. (#145291, Sampo Nurmentaus) + Sat Jul 3 23:43:23 2004 Matthias Clasen * docs/faq/gtk-faq.sgml: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 901dbaba48..d88bba1074 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Jul 4 01:11:07 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if + somebody tries to move a node after itself in a list of + length 1. (#145291, Sampo Nurmentaus) + Sat Jul 3 23:43:23 2004 Matthias Clasen * docs/faq/gtk-faq.sgml: diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index a66d53917e..d59c97b58a 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -2317,7 +2317,8 @@ gtk_tree_store_move (GtkTreeStore *tree_store, parent->children = node; node->next = tmp; - tmp->prev = node; + if (tmp) + tmp->prev = node; handle_b = FALSE; }