Skip to content

Commit

Permalink
Don't check qobject_type() before qobject_to_qdict()
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
  • Loading branch information
Markus Armbruster committed Feb 22, 2017
1 parent 4b32e11 commit ca6b6e1
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 44 deletions.
4 changes: 2 additions & 2 deletions block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1169,13 +1169,13 @@ static QDict *parse_json_filename(const char *filename, Error **errp)
return NULL;
}

if (qobject_type(options_obj) != QTYPE_QDICT) {
options = qobject_to_qdict(options_obj);
if (!options) {
qobject_decref(options_obj);
error_setg(errp, "Invalid JSON object given");
return NULL;
}

options = qobject_to_qdict(options_obj);
qdict_flatten(options);

return options;
Expand Down
2 changes: 1 addition & 1 deletion hw/pci/pcie_aer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,8 +1025,8 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict)
return;
}

assert(qobject_type(data) == QTYPE_QDICT);
qdict = qobject_to_qdict(data);
assert(qdict);

devfn = (int)qdict_get_int(qdict, "devfn");
monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n",
Expand Down
4 changes: 2 additions & 2 deletions monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3686,12 +3686,12 @@ static QDict *qmp_check_input_obj(QObject *input_obj, Error **errp)
int has_exec_key = 0;
QDict *input_dict;

if (qobject_type(input_obj) != QTYPE_QDICT) {
input_dict = qobject_to_qdict(input_obj);
if (!input_dict) {
error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT, "object");
return NULL;
}

input_dict = qobject_to_qdict(input_obj);

for (ent = qdict_first(input_dict); ent; ent = qdict_next(input_dict, ent)){
const char *arg_name = qdict_entry_key(ent);
Expand Down
5 changes: 2 additions & 3 deletions qapi/qmp-dispatch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
bool has_exec_key = false;
QDict *dict = NULL;

if (qobject_type(request) != QTYPE_QDICT) {
dict = qobject_to_qdict(request);
if (!dict) {
error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT,
"request is not a dictionary");
return NULL;
}

dict = qobject_to_qdict(request);

for (ent = qdict_first(dict); ent;
ent = qdict_next(dict, ent)) {
arg_name = qdict_entry_key(ent);
Expand Down
9 changes: 2 additions & 7 deletions tests/check-qdict.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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");
Expand Down
41 changes: 12 additions & 29 deletions tests/test-qobject-output-visitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,12 @@ static void test_visitor_out_struct(TestOutputVisitorData *data,
.boolean = false,
.string = (char *) "foo"};
TestStruct *p = &test_struct;
QObject *obj;
QDict *qdict;

visit_type_TestStruct(data->ov, NULL, &p, &error_abort);

obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QDICT);

qdict = qobject_to_qdict(obj);
qdict = qobject_to_qdict(visitor_get(data));
g_assert(qdict);
g_assert_cmpint(qdict_size(qdict), ==, 3);
g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 42);
g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, false);
Expand All @@ -180,7 +177,6 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,
{
int64_t value = 42;
UserDefTwo *ud2;
QObject *obj;
QDict *qdict, *dict1, *dict2, *dict3, *userdef;
const char *string = "user def string";
const char *strings[] = { "forty two", "forty three", "forty four",
Expand All @@ -207,10 +203,8 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,

visit_type_UserDefTwo(data->ov, "unused", &ud2, &error_abort);

obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QDICT);

qdict = qobject_to_qdict(obj);
qdict = qobject_to_qdict(visitor_get(data));
g_assert(qdict);
g_assert_cmpint(qdict_size(qdict), ==, 2);
g_assert_cmpstr(qdict_get_str(qdict, "string0"), ==, strings[0]);

Expand Down Expand Up @@ -296,8 +290,8 @@ static void test_visitor_out_list(TestOutputVisitorData *data,
QLIST_FOREACH_ENTRY(qlist, entry) {
QDict *qdict;

g_assert(qobject_type(entry->value) == QTYPE_QDICT);
qdict = qobject_to_qdict(entry->value);
g_assert(qdict);
g_assert_cmpint(qdict_size(qdict), ==, 3);
g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, value_int + i);
g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, value_bool);
Expand Down Expand Up @@ -362,8 +356,7 @@ static void test_visitor_out_any(TestOutputVisitorData *data,
qobj = QOBJECT(qdict);
visit_type_any(data->ov, NULL, &qobj, &error_abort);
qobject_decref(qobj);
obj = visitor_get(data);
qdict = qobject_to_qdict(obj);
qdict = qobject_to_qdict(visitor_get(data));
g_assert(qdict);
qobj = qdict_get(qdict, "integer");
g_assert(qobj);
Expand All @@ -385,7 +378,6 @@ static void test_visitor_out_any(TestOutputVisitorData *data,
static void test_visitor_out_union_flat(TestOutputVisitorData *data,
const void *unused)
{
QObject *arg;
QDict *qdict;

UserDefFlatUnion *tmp = g_malloc0(sizeof(UserDefFlatUnion));
Expand All @@ -395,11 +387,8 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data,
tmp->u.value1.boolean = true;

visit_type_UserDefFlatUnion(data->ov, NULL, &tmp, &error_abort);
arg = visitor_get(data);

g_assert(qobject_type(arg) == QTYPE_QDICT);
qdict = qobject_to_qdict(arg);

qdict = qobject_to_qdict(visitor_get(data));
g_assert(qdict);
g_assert_cmpstr(qdict_get_str(qdict, "enum1"), ==, "value1");
g_assert_cmpstr(qdict_get_str(qdict, "string"), ==, "str");
g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 41);
Expand Down Expand Up @@ -449,10 +438,8 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
tmp->u.udfu.u.value1.boolean = true;

visit_type_UserDefAlternate(data->ov, NULL, &tmp, &error_abort);
arg = visitor_get(data);

g_assert_cmpint(qobject_type(arg), ==, QTYPE_QDICT);
qdict = qobject_to_qdict(arg);
qdict = qobject_to_qdict(visitor_get(data));
g_assert(qdict);
g_assert_cmpint(qdict_size(qdict), ==, 4);
g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 1);
g_assert_cmpstr(qdict_get_str(qdict, "string"), ==, "str");
Expand All @@ -465,17 +452,15 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
static void test_visitor_out_null(TestOutputVisitorData *data,
const void *unused)
{
QObject *arg;
QDict *qdict;
QObject *nil;

visit_start_struct(data->ov, NULL, NULL, 0, &error_abort);
visit_type_null(data->ov, "a", &error_abort);
visit_check_struct(data->ov, &error_abort);
visit_end_struct(data->ov, NULL);
arg = visitor_get(data);
g_assert(qobject_type(arg) == QTYPE_QDICT);
qdict = qobject_to_qdict(arg);
qdict = qobject_to_qdict(visitor_get(data));
g_assert(qdict);
g_assert_cmpint(qdict_size(qdict), ==, 1);
nil = qdict_get(qdict, "a");
g_assert(nil);
Expand Down Expand Up @@ -618,8 +603,6 @@ static void check_native_list(QObject *qobj,
QList *qlist;
int i;

g_assert(qobj);
g_assert(qobject_type(qobj) == QTYPE_QDICT);
qdict = qobject_to_qdict(qobj);
g_assert(qdict);
g_assert(qdict_haskey(qdict, "data"));
Expand Down

0 comments on commit ca6b6e1

Please sign in to comment.