aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-04-30 11:44:17 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2018-05-09 00:13:37 +0200
commit770dec2627b085457280490ac0543def97396fef (patch)
tree30d62cd3ed9b39f9ad07a5d650475a66f041bb8d /qom
parent82870f3c0295d36c342942b4757b2b1ddd55ab19 (diff)
qom: allow object_get_canonical_path_component without parent
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>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/qom/object.c b/qom/object.c
index 76a89af99b..0fc972030e 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)) {