luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly abort instead of looping infinitely

Browse Source 
Fixes: Bug 568760 - nautilus freezes due to a bug in garray.c:322

* glib/garray.c: increase the size of potential return values by
  using an unsigned result; properly check if we still handle valid size
  proposals, return the original request if there's no usable size left
* tests/array-test.c: reproduce the error condition of the bug report
This commit is contained in:
Sven Herzberg 2010-01-13 14:47:58 +01:00
parent 820181a5de
commit 7448eb71c3
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/garray.c
View File

@ -67,9 +67,9 @@ struct _GRealArray
g_array_elt_zero ((array), (array)->len, 1); \ g_array_elt_zero ((array), (array)->len, 1); \
}G_STMT_END }G_STMT_END
static gint g_nearest_pow (gint num) G_GNUC_CONST; static guint g_nearest_pow (gint num) G_GNUC_CONST;
static void g_array_maybe_expand (GRealArray *array, static void g_array_maybe_expand (GRealArray *array,
gint len); gint len);
GArray* GArray*
g_array_new (gboolean zero_terminated, g_array_new (gboolean zero_terminated,
@ -387,16 +387,18 @@ g_array_sort_with_data (GArray *farray,
user_data); user_data);
} }
/* Returns the smallest power of 2 greater than n, or n if
static gint * such power does not fit in a guint
*/
static guint
g_nearest_pow (gint num) g_nearest_pow (gint num)
{ {
gint n = 1; guint n = 1;
while (n < num) while (n < num && n > 0)
n <<= 1; n <<= 1;
return n; return n ? n : num;
} }
static void static void

24
glib/tests/array-test.c
View File

@ -28,6 +28,7 @@
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "glib.h" #include "glib.h"
@ -99,6 +100,26 @@ array_ref_count (void)
g_array_unref (garray2); g_array_unref (garray2);
} }
static void
array_large_size (void)
{
GArray* array;
g_test_bug ("568760");
array = g_array_new (TRUE, TRUE, sizeof (char));
/* it might take really long until the allocation happens */
if (g_test_trap_fork (10 /* s */ * 1000 /* ms */ * 1000 /* µs */, 0))
{
g_array_set_size (array, 1073750016);
exit (0); /* success */
}
g_test_trap_assert_passed ();
g_array_free (array, TRUE);
}
static void static void
pointer_array_add (void) pointer_array_add (void)
{ {
@ -288,10 +309,13 @@ main (int argc, char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugs.gnome.org/%s");
/* array tests */ /* array tests */
g_test_add_func ("/array/append", array_append); g_test_add_func ("/array/append", array_append);
g_test_add_func ("/array/prepend", array_prepend); g_test_add_func ("/array/prepend", array_prepend);
g_test_add_func ("/array/ref-count", array_ref_count); g_test_add_func ("/array/ref-count", array_ref_count);
g_test_add_func ("/array/large-size", array_large_size);
/* pointer arrays */ /* pointer arrays */
g_test_add_func ("/pointerarray/add", pointer_array_add); g_test_add_func ("/pointerarray/add", pointer_array_add);