32 lines
728 B
Diff
32 lines
728 B
Diff
--- dbus/dbus-gproxy.c 2005-11-30 20:32:26.000000000 +0100
|
|
+++ dbus/dbus-gproxy.c 2006-02-21 22:42:46.000000000 +0100
|
|
@@ -494,6 +494,9 @@
|
|
const DBusGProxyNameOwnerInfo *info = a;
|
|
const char *name = b;
|
|
|
|
+ g_return_val_if_fail (a != NULL, 1);
|
|
+ g_return_val_if_fail (b != NULL, 1);
|
|
+
|
|
return strcmp (info->name, name);
|
|
}
|
|
|
|
@@ -556,6 +559,8 @@
|
|
GSList *names;
|
|
gboolean insert;
|
|
|
|
+ g_return_if_fail (info != NULL);
|
|
+
|
|
names = g_hash_table_lookup (manager->owner_names, owner);
|
|
|
|
/* Only need to g_hash_table_insert the first time */
|
|
@@ -749,7 +754,8 @@
|
|
}
|
|
else
|
|
{
|
|
- insert_nameinfo (manager, new_owner, info);
|
|
+ if (info != NULL)
|
|
+ insert_nameinfo (manager, new_owner, info);
|
|
}
|
|
}
|
|
}
|