From b1db95a6fb6c2bde7d4925864c46d716f4a574ee Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Fri, 24 May 2002 16:24:04 +0000 Subject: [PATCH] Use indices[i] >= level->array->len rather than level->array->len > 2002-05-24 Dave Camp * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len rather than level->array->len > indices[i] in the bounds check. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreemodelsort.c | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 26c325ed4..4c5df5472 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len + rather than level->array->len > indices[i] in the bounds check. + 2002-05-23 Tor Lillqvist * gtk-zip.sh.in: Use correct path to the loaders and immodules diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 26c325ed4..4c5df5472 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len + rather than level->array->len > indices[i] in the bounds check. + 2002-05-23 Tor Lillqvist * gtk-zip.sh.in: Use correct path to the loaders and immodules diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 26c325ed4..4c5df5472 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len + rather than level->array->len > indices[i] in the bounds check. + 2002-05-23 Tor Lillqvist * gtk-zip.sh.in: Use correct path to the loaders and immodules diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 26c325ed4..4c5df5472 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len + rather than level->array->len > indices[i] in the bounds check. + 2002-05-23 Tor Lillqvist * gtk-zip.sh.in: Use correct path to the loaders and immodules diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 26c325ed4..4c5df5472 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len + rather than level->array->len > indices[i] in the bounds check. + 2002-05-23 Tor Lillqvist * gtk-zip.sh.in: Use correct path to the loaders and immodules diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 26c325ed4..4c5df5472 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-05-24 Dave Camp + + * gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len + rather than level->array->len > indices[i] in the bounds check. + 2002-05-23 Tor Lillqvist * gtk-zip.sh.in: Use correct path to the loaders and immodules diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index eb9b87e3f..a51e67c00 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -883,7 +883,7 @@ gtk_tree_model_sort_get_iter (GtkTreeModel *tree_model, for (i = 0; i < depth - 1; i++) { if ((level == NULL) || - (level->array->len < indices[i])) + (indices[i] >= level->array->len)) return FALSE; if (g_array_index (level->array, SortElt, indices[i]).children == NULL)