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

gtype: fix a no-op assertion

Browse Source 
g_type_class_add_private() was doing

    g_assert (node->data->instance.private_size <= 0xffff);

but that field is a guint16, so the check was a no-op. (Noticed by
clang, but not gcc for some reason.) Fix it to do the math in a gssize
variable and do the bounds checking there before updating the struct
field.

https://bugzilla.gnome.org/show_bug.cgi?id=706888
This commit is contained in:
Dan Winship 2013-08-27 09:40:18 -04:00
parent ca4f6ba855
commit 34e1a53795
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gobject/gtype.c
View File

@ -4503,8 +4503,9 @@ g_type_class_add_private (gpointer g_class,
G_WRITE_LOCK (&type_rw_lock);
node->data->instance.private_size = ALIGN_STRUCT (node->data->instance.private_size + private_size);
g_assert (node->data->instance.private_size <= 0xffff);
private_size = ALIGN_STRUCT (node->data->instance.private_size + private_size);
g_assert (private_size <= 0xffff);
node->data->instance.private_size = private_size;
G_WRITE_UNLOCK (&type_rw_lock);
}
@ -4573,6 +4574,7 @@ g_type_class_adjust_private_offset (gpointer g_class,
{
GType class_gtype = ((GTypeClass *) g_class)->g_type;
TypeNode *node = lookup_type_node_I (class_gtype);
gssize private_size;
g_return_if_fail (private_size_or_offset != NULL);
@ -4606,8 +4608,9 @@ g_type_class_adjust_private_offset (gpointer g_class,
G_WRITE_LOCK (&type_rw_lock);
node->data->instance.private_size = ALIGN_STRUCT (node->data->instance.private_size + *private_size_or_offset);
g_assert (node->data->instance.private_size <= 0xffff);
private_size = ALIGN_STRUCT (node->data->instance.private_size + *private_size_or_offset);
g_assert (private_size <= 0xffff);
node->data->instance.private_size = private_size;
*private_size_or_offset = -(gint) node->data->instance.private_size;