Attachment 51674 Details for Bug 37793 – [2/6] dbus-gtype-specialized: warn if vtables have missing callbacks

[patch] [2/6] dbus-gtype-specialized: warn if vtables have missing callbacks

0002-dbus-gtype-specialized-warn-if-vtables-have-missing-.patch (text/plain), 2.50 KB, created by Simon McVittie on 2011-09-27 11:03:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-27 11:03:45 UTC

Size: 2.50 KB

patch

obsolete

>From 4d3c1df34e65b6f5a2d7616c80f6df09d1fb3f51 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 27 Sep 2011 17:41:36 +0100
>Subject: [PATCH 2/6] dbus-gtype-specialized: warn if vtables have missing
> callbacks
>
>It's just about conceivable that they wouldn't segfault, if application
>authors carefully avoided the unimplemented functionality... but still.
>---
> dbus/dbus-gtype-specialized.c |   19 ++++++++++++++++++-
> 1 files changed, 18 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-gtype-specialized.c b/dbus/dbus-gtype-specialized.c
>index 4964c4b..84efaf6 100644
>--- a/dbus/dbus-gtype-specialized.c
>+++ b/dbus/dbus-gtype-specialized.c
>@@ -260,7 +260,13 @@ register_container (const char                         *name,
> 		    const DBusGTypeSpecializedVtable   *vtable)
> {
>   DBusGTypeSpecializedContainer *klass;
>-  
>+
>+  g_warn_if_fail (vtable->constructor != NULL);
>+  /* must have either free_func or simple_free_func */
>+  g_warn_if_fail (vtable->free_func != NULL ||
>+                  vtable->simple_free_func != NULL);
>+  g_warn_if_fail (vtable->copy_func != NULL);
>+
>   klass = g_new0 (DBusGTypeSpecializedContainer, 1);
>   klass->type = type;
>   klass->vtable = vtable;
>@@ -291,6 +297,11 @@ _dbus_g_type_register_collection (const char                                   *
> 				  const DBusGTypeSpecializedCollectionVtable   *vtable,
> 				  guint                                         flags)
> {
>+  /* fixed_accessor is optional */
>+  g_warn_if_fail (vtable->iterator != NULL);
>+  g_warn_if_fail (vtable->append_func != NULL);
>+  /* end_append_func is optional */
>+
>   register_container (name, DBUS_G_SPECTYPE_COLLECTION, (const DBusGTypeSpecializedVtable*) vtable);
> }
> 
>@@ -317,6 +328,9 @@ _dbus_g_type_register_map (const char                            *name,
> 			   const DBusGTypeSpecializedMapVtable   *vtable,
> 			   guint                                  flags)
> {
>+  g_warn_if_fail (vtable->iterator != NULL);
>+  g_warn_if_fail (vtable->append_func != NULL);
>+
>   register_container (name, DBUS_G_SPECTYPE_MAP, (const DBusGTypeSpecializedVtable*) vtable);
> }
> 
>@@ -343,6 +357,9 @@ _dbus_g_type_register_struct (const char                             *name,
> 			      const DBusGTypeSpecializedStructVtable *vtable,
> 			      guint                                   flags)
> {
>+  g_warn_if_fail (vtable->get_member != NULL);
>+  g_warn_if_fail (vtable->set_member != NULL);
>+
>   register_container (name, DBUS_G_SPECTYPE_STRUCT, (const DBusGTypeSpecializedVtable*) vtable);
> }
> 
>-- 
>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.