diff options
author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-01-14 16:14:20 +0100 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@nokia.com> | 2011-01-19 20:36:45 +0530 |
commit | eea57f916c65ae7a12b5c39f98dd64ba980fe33b (patch) | |
tree | 8a8bf8de0cdb4196a2d13bea8a715bfe6b201cb7 | |
parent | d0a3daef0caddfc43dcee91433a4cc9ca505bb06 (diff) | |
download | bluez-eea57f916c65ae7a12b5c39f98dd64ba980fe33b.tar.gz |
gdbus: invaldate_parent_data: walk the whole path down
Assume there is only one object registerd at "/". If we add a new
object at "/foo/bar" the introspection of "/" has to be updated. A new
node has to be added at "/".
invalidate_parent_data stops invaldating the whole path because the
boolean return value of dbus_connection_get_object_path_data is used
wrong.
If we get a TRUE just go on down in the path, if FALSE is return
dbus_connection_get_object_path_data has run out of memory.
-rw-r--r-- | gdbus/object.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index afa904eb4..49006ec31 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -475,12 +475,13 @@ static void invalidate_parent_data(DBusConnection *conn, const char *child_path) if (!strlen(parent_path)) goto done; - if (!dbus_connection_get_object_path_data(conn, parent_path, - (void *) &data)) { - invalidate_parent_data(conn, parent_path); + if (dbus_connection_get_object_path_data(conn, parent_path, + (void *) &data) == FALSE) { goto done; } + invalidate_parent_data(conn, parent_path); + if (data == NULL) goto done; |