[next] telepathy-glib: dbus.c: add some safe pre-condition checks

Simon McVittie smcv at kemper.freedesktop.org
Wed Sep 17 05:22:52 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 3f154e2f027baab1c990a15f8d91185bc4e18116
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=3f154e2f027baab1c990a15f8d91185bc4e18116

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed May 28 11:59:45 2014 +0200

dbus.c: add some safe pre-condition checks

---

 telepathy-glib/dbus.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 552e0fd..0e3bf26 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -527,6 +527,7 @@ tp_dbus_connection_request_name (GDBusConnection *dbus_connection,
   guint32 result;
 
   g_return_val_if_fail (G_IS_DBUS_CONNECTION (dbus_connection), FALSE);
+  g_return_val_if_fail (well_known_name != NULL, FALSE);
   g_return_val_if_fail (tp_dbus_check_valid_bus_name (well_known_name,
         TP_DBUS_NAME_TYPE_WELL_KNOWN, error), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -609,6 +610,7 @@ tp_dbus_connection_release_name (GDBusConnection *dbus_connection,
   GVariant *tuple;
 
   g_return_val_if_fail (G_IS_DBUS_CONNECTION (dbus_connection), FALSE);
+  g_return_val_if_fail (well_known_name != NULL, FALSE);
   g_return_val_if_fail (tp_dbus_check_valid_bus_name (well_known_name,
         TP_DBUS_NAME_TYPE_WELL_KNOWN, error), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -777,6 +779,10 @@ tp_dbus_connection_register_object (GDBusConnection *dbus_connection,
 {
   GError *error = NULL;
 
+  g_return_if_fail (G_IS_DBUS_CONNECTION (dbus_connection));
+  g_return_if_fail (object_path != NULL);
+  g_return_if_fail (object != NULL);
+
   if (!tp_dbus_connection_try_register_object (dbus_connection, object_path,
           object, &error))
     {
@@ -909,6 +915,7 @@ tp_dbus_connection_try_register_object (GDBusConnection *dbus_connection,
   gpointer iface_name_p;
 
   g_return_val_if_fail (G_IS_DBUS_CONNECTION (dbus_connection), FALSE);
+  g_return_val_if_fail (object_path != NULL, FALSE);
   g_return_val_if_fail (tp_dbus_check_valid_object_path (object_path, error),
       FALSE);
   g_return_val_if_fail (G_IS_OBJECT (object), FALSE);



More information about the telepathy-commits mailing list