Attachment 51677 Details for Bug 37793 – [4/6] dbus_g_type_collection_value_iterate, etc.: check that the type is suitable

[patch] [4/6] dbus_g_type_collection_value_iterate, etc.: check that the type is suitable

0004-dbus_g_type_collection_value_iterate-etc.-check-that.patch (text/plain), 4.10 KB, created by Simon McVittie on 2011-09-27 11:05:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-27 11:05:47 UTC

Size: 4.10 KB

patch

obsolete

>From e664f027b16bc0fe0b5dc46469660b78c876c80b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 27 Sep 2011 17:50:07 +0100
>Subject: [PATCH 4/6] dbus_g_type_collection_value_iterate, etc.: check that
> the type is suitable
>
>Otherwise we'd probably crash when we cast the vtable to an inappropriate
>type, and call its methods with inappropriate arguments as a result.
>---
> dbus/dbus-gtype-specialized.c |   29 +++++++++++++++++++++++++----
> 1 files changed, 25 insertions(+), 4 deletions(-)
>
>diff --git a/dbus/dbus-gtype-specialized.c b/dbus/dbus-gtype-specialized.c
>index 5eeb365..0b8a4b0 100644
>--- a/dbus/dbus-gtype-specialized.c
>+++ b/dbus/dbus-gtype-specialized.c
>@@ -814,8 +814,11 @@ dbus_g_type_collection_value_iterate (const GValue                           *va
>   g_return_if_fail (G_VALUE_HOLDS_BOXED (value));
> 
>   gtype = G_VALUE_TYPE (value);
>+  g_return_val_if_fail (dbus_g_type_is_collection (gtype), FALSE);
>+
>   data = lookup_specialization_data (gtype);
>-  g_return_if_fail (data != NULL);
>+  /* dbus_g_type_is_collection() already checked this */
>+  g_assert (data != NULL);
> 
>   ((DBusGTypeSpecializedCollectionVtable *) data->klass->vtable)->iterator (gtype,
> 									    g_value_get_boxed (value),
>@@ -870,6 +873,9 @@ dbus_g_type_specialized_collection_append (DBusGTypeSpecializedAppendContext *ct
> 					   GValue                            *elt)
> {
>   DBusGTypeSpecializedAppendContextReal *realctx = (DBusGTypeSpecializedAppendContextReal *) ctx;
>+
>+  g_return_if_fail (dbus_g_type_is_collection (realctx->gtype));
>+
>   ((DBusGTypeSpecializedCollectionVtable *) realctx->specdata->klass->vtable)->append_func (ctx, elt);
> }
> 
>@@ -884,6 +890,9 @@ void
> dbus_g_type_specialized_collection_end_append (DBusGTypeSpecializedAppendContext *ctx)
> {
>   DBusGTypeSpecializedAppendContextReal *realctx = (DBusGTypeSpecializedAppendContextReal *) ctx;
>+
>+  g_return_if_fail (dbus_g_type_is_collection (realctx->gtype));
>+
>   if (((DBusGTypeSpecializedCollectionVtable *) realctx->specdata->klass->vtable)->end_append_func != NULL)
>     ((DBusGTypeSpecializedCollectionVtable *) realctx->specdata->klass->vtable)->end_append_func (ctx);
> }
>@@ -903,6 +912,9 @@ dbus_g_type_specialized_map_append (DBusGTypeSpecializedAppendContext *ctx,
> 				    GValue                            *val)
> {
>   DBusGTypeSpecializedAppendContextReal *realctx = (DBusGTypeSpecializedAppendContextReal *) ctx;
>+
>+  g_return_if_fail (dbus_g_type_is_map (realctx->gtype));
>+
>   ((DBusGTypeSpecializedMapVtable *) realctx->specdata->klass->vtable)->append_func (ctx, key, val);
> }
> 
>@@ -931,8 +943,11 @@ dbus_g_type_map_value_iterate (const GValue                           *value,
>   g_return_if_fail (G_VALUE_HOLDS_BOXED (value));
> 
>   gtype = G_VALUE_TYPE (value);
>+  g_return_if_fail (dbus_g_type_is_map (gtype));
>+
>   data = lookup_specialization_data (gtype);
>-  g_return_if_fail (data != NULL);
>+  /* already checked by dbus_g_type_is_map() */
>+  g_assert (data != NULL);
> 
>   ((DBusGTypeSpecializedMapVtable *) data->klass->vtable)->iterator (gtype,
> 								     g_value_get_boxed (value),
>@@ -964,8 +979,11 @@ dbus_g_type_struct_get_member (const GValue *value,
>   g_return_val_if_fail (G_VALUE_HOLDS_BOXED (value), FALSE);
> 
>   gtype = G_VALUE_TYPE (value);
>+  g_return_if_fail (dbus_g_type_is_struct (gtype));
>+
>   data = lookup_specialization_data (gtype);
>-  g_return_val_if_fail (data != NULL, FALSE);
>+  /* already checked by dbus_g_type_is_struct() */
>+  g_assert (data != NULL);
> 
>   return ((DBusGTypeSpecializedStructVtable *) (data->klass->vtable))->get_member(gtype,
> 											   g_value_get_boxed (value),
>@@ -996,8 +1014,11 @@ dbus_g_type_struct_set_member (GValue       *value,
>   g_return_val_if_fail (G_VALUE_HOLDS_BOXED (value), FALSE);
> 
>   gtype = G_VALUE_TYPE (value);
>+  g_return_if_fail (dbus_g_type_is_struct (gtype));
>+
>   data = lookup_specialization_data (gtype);
>-  g_return_val_if_fail (data != NULL, FALSE);
>+  /* already checked by dbus_g_type_is_struct() */
>+  g_assert (data != NULL);
> 
>   return ((DBusGTypeSpecializedStructVtable *) (data->klass->vtable))->set_member(gtype,
> 											   g_value_get_boxed (value),
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 37793: 47383 | 47384 | 47385 | 47386 | 47387 | 47388 | 47389 | 47390 | 47391 | 47392 | 47393 | 47394 | 47395 | 47396 | 51673 | 51674 | 51676 | 51677 | 51679 | 51680

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.