luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvaluetransform: Fix an infinite loop with GFlagsValue sets with the 0 value

Browse Source 
Transforming a GValue holding flags from a GFlagsValue set that includes the 0
value (no flag bits set) into a string would loop until exhausting all the
available memory.

https://bugzilla.gnome.org/show_bug.cgi?id=670557
This commit is contained in:
Rui Matos 2012-02-21 16:42:43 +01:00
parent 9e5ff3d3eb
commit 9ff09f34cf
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gobject/gvaluetransform.c
View File

@ -216,7 +216,7 @@ value_transform_flags_string (const GValue *src_value,
g_string_append (gstring, flags_value->value_name);
flags_value = g_flags_get_first_value (class, v_flags);
}
while (flags_value);
while (flags_value && v_flags);
if (v_flags)
dest_value->data[0].v_pointer = g_strdup_printf ("%s | %u",

16
gobject/tests/enums.c
View File

@ -52,12 +52,22 @@ test_enum_basic (void)
static const GFlagsValue my_flag_values[] =
{
{ 0, "no flags", "none" },
{ 1, "the first flag", "one" },
{ 2, "the second flag", "two" },
{ 8, "the third flag", "three" },
{ 0, NULL, NULL }
};
static void
test_flags_transform_to_string (const GValue *value)
{
GValue tmp = G_VALUE_INIT;
g_value_init (&tmp, G_TYPE_STRING);
g_value_transform (value, &tmp);
g_value_unset (&tmp);
}
static void
test_flags_basic (void)
@ -74,12 +84,11 @@ test_flags_basic (void)
g_value_set_flags (&value, 2|8);
g_assert_cmpint (g_value_get_flags (&value), ==, 2|8);
g_value_unset (&value);
class = g_type_class_ref (type);
g_assert_cmpint (class->mask, ==, 1|2|8);
g_assert_cmpint (class->n_values, ==, 3);
g_assert_cmpint (class->n_values, ==, 4);
val = g_flags_get_first_value (class, 2|8);
g_assert (val != NULL);
@ -98,6 +107,9 @@ test_flags_basic (void)
g_assert_cmpint (val->value, ==, 1);
val = g_flags_get_value_by_nick (class, "purple");
g_assert (val == NULL);
test_flags_transform_to_string (&value);
g_value_unset (&value);
}
int