diff mbox series

[PULL,05/30] qom: allow object_get_canonical_path_component without parent

Message ID 1525817687-34620-6-git-send-email-pbonzini@redhat.com
State New
Headers show
Series [PULL,01/30] configure: recognize more rpmbuild macros | expand

Commit Message

Paolo Bonzini May 8, 2018, 10:14 p.m. UTC 
Just return NULL; any callers that cause a change in behavior
would have caused an assertion failure before, so this is safe.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/qom/object.h | 1 +
 qom/object.c         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/include/qom/object.h b/include/qom/object.h
index 96ce81b..a0c78c7 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1302,6 +1302,7 @@  Object *object_get_internal_root(void);
  *
  * Returns: The final component in the object's canonical path.  The canonical
  * path is the path within the composition tree starting from the root.
+ * %NULL if the object doesn't have a parent (and thus a canonical path).
  */
 gchar *object_get_canonical_path_component(Object *obj);
 
diff --git a/qom/object.c b/qom/object.c
index 76a89af..0fc9720 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1644,8 +1644,9 @@  gchar *object_get_canonical_path_component(Object *obj)
     ObjectProperty *prop = NULL;
     GHashTableIter iter;
 
-    g_assert(obj);
-    g_assert(obj->parent != NULL);
+    if (obj->parent == NULL) {
+        return NULL;
+    }
 
     g_hash_table_iter_init(&iter, obj->parent->properties);
     while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&prop)) {