From: Sebastian Wilhelmi Date: Mon, 3 Aug 1998 07:18:23 +0000 (+0000) Subject: garray.c (g_ptr_array_remove_index): bugfix: index check for array has X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=de89a5b945f443a01249bed1d4bfa1bafb35ca66;p=dana%2Fcg-glib.git garray.c (g_ptr_array_remove_index): bugfix: index check for array has been wrong --- diff --git a/ChangeLog b/ChangeLog index 9ba7458c..b393a665 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9ba7458c..b393a665 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +1998-08-03 Sebastian Wilhelmi + + * garray.c (g_ptr_array_remove_index): bugfix: index check for + array has been wrong. + Fri Jul 31 22:17:05 1998 Tim Janik * testglib.c (g_node_test): added a GNode test. diff --git a/garray.c b/garray.c index 16c1063a..6bd0e7af 100644 --- a/garray.c +++ b/garray.c @@ -236,7 +236,7 @@ g_ptr_array_remove_index (GPtrArray* farray, g_return_if_fail (array); - g_return_if_fail (index >= array->len); + g_return_if_fail (index < array->len); array->pdata[index] = array->pdata[array->len - 1]; diff --git a/glib/garray.c b/glib/garray.c index 16c1063a..6bd0e7af 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -236,7 +236,7 @@ g_ptr_array_remove_index (GPtrArray* farray, g_return_if_fail (array); - g_return_if_fail (index >= array->len); + g_return_if_fail (index < array->len); array->pdata[index] = array->pdata[array->len - 1];