diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-17 21:38:18 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-22 19:52:01 +0100 |
| commit | ca6b6e1e68ac44b2e8895da10dd1c80dc03d08b7 (patch) | |
| tree | 3e820280a3eb45a68186eaec2f46fba2b1fe63b8 /tests/check-qdict.c | |
| parent | 4b32e11a59e34c5cf570c1fd102a78d9351e71f5 (diff) | |
| download | focaccia-qemu-ca6b6e1e68ac44b2e8895da10dd1c80dc03d08b7.tar.gz focaccia-qemu-ca6b6e1e68ac44b2e8895da10dd1c80dc03d08b7.zip | |
Don't check qobject_type() before qobject_to_qdict()
qobject_to_qdict(obj) returns NULL when obj isn't a QDict. Check that instead of qobject_type(obj) == QTYPE_QDICT. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1487363905-9480-8-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/check-qdict.c')
| -rw-r--r-- | tests/check-qdict.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/check-qdict.c b/tests/check-qdict.c index ded3a264e1..81162ee572 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -591,7 +591,6 @@ static void qdict_join_test(void) static void qdict_crumple_test_recursive(void) { QDict *src, *dst, *rule, *vnc, *acl, *listen; - QObject *res; QList *rules; src = qdict_new(); @@ -605,12 +604,8 @@ static void qdict_crumple_test_recursive(void) qdict_put(src, "vnc.acl..name", qstring_from_str("acl0")); qdict_put(src, "vnc.acl.rule..name", qstring_from_str("acl0")); - res = qdict_crumple(src, &error_abort); - - g_assert_cmpint(qobject_type(res), ==, QTYPE_QDICT); - - dst = qobject_to_qdict(res); - + dst = qobject_to_qdict(qdict_crumple(src, &error_abort)); + g_assert(dst); g_assert_cmpint(qdict_size(dst), ==, 1); vnc = qdict_get_qdict(dst, "vnc"); |