Use indices[i] >= level->array->len rather than level->array->len >

2002-05-24  Dave Camp  <dave@ximian.com>

	* gtk/gtktreemodelsort.c: Use indices[i] >= level->array->len
	rather than level->array->len > indices[i] in the bounds check.

diff --git a/ChangeLog b/ChangeLog
index 26c325ed43dba06a7648cf06e991ebfdd854556f..4c5df5472b123a92dddd869bf73a7126f0d2b322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Dave Camp  <dave@ximian.com>
+
+       * 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  <tml@iki.fi>
 
        * 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 26c325ed43dba06a7648cf06e991ebfdd854556f..4c5df5472b123a92dddd869bf73a7126f0d2b322 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-05-24  Dave Camp  <dave@ximian.com>
+
+       * 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  <tml@iki.fi>
 
        * 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 26c325ed43dba06a7648cf06e991ebfdd854556f..4c5df5472b123a92dddd869bf73a7126f0d2b322 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-05-24  Dave Camp  <dave@ximian.com>
+
+       * 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  <tml@iki.fi>
 
        * 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 26c325ed43dba06a7648cf06e991ebfdd854556f..4c5df5472b123a92dddd869bf73a7126f0d2b322 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-05-24  Dave Camp  <dave@ximian.com>
+
+       * 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  <tml@iki.fi>
 
        * 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 26c325ed43dba06a7648cf06e991ebfdd854556f..4c5df5472b123a92dddd869bf73a7126f0d2b322 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-05-24  Dave Camp  <dave@ximian.com>
+
+       * 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  <tml@iki.fi>
 
        * 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 26c325ed43dba06a7648cf06e991ebfdd854556f..4c5df5472b123a92dddd869bf73a7126f0d2b322 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-05-24  Dave Camp  <dave@ximian.com>
+
+       * 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  <tml@iki.fi>
 
        * gtk-zip.sh.in: Use correct path to the loaders and immodules

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index eb9b87e3fb3458867cf3d766ff35915c6b6c7c6a..a51e67c0016e04e888040c58d94bf7b2f35e6f62 100644 (file)
--- 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)