mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check-qjson: Test errors from qobject_from_json()

Browse Source 
Pass &error_abort with known-good input.  Else pass &err and check
what comes back.  This demonstrates that the parser fails silently for
many errors.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-15-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-28 22:27:00 +01:00
parent 5577fff738
commit aec4b054ea
1 changed files with 56 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
tests/check-qjson.c
View File

@ -10,8 +10,10 @@
* See the COPYING.LIB file in the top-level directory. * See the COPYING.LIB file in the top-level directory.
* *
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/qmp/types.h" #include "qapi/qmp/types.h"
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
#include "qemu-common.h" #include "qemu-common.h"
@ -53,7 +55,7 @@ static void escaped_string(void)
QObject *obj; QObject *obj;
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
str = qobject_to_qstring(obj); str = qobject_to_qstring(obj);
g_assert(str); g_assert(str);
g_assert_cmpstr(qstring_get_str(str), ==, test_cases[i].decoded); g_assert_cmpstr(qstring_get_str(str), ==, test_cases[i].decoded);
@ -85,7 +87,7 @@ static void simple_string(void)
QObject *obj; QObject *obj;
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
str = qobject_to_qstring(obj); str = qobject_to_qstring(obj);
g_assert(str); g_assert(str);
g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0);
@ -116,7 +118,7 @@ static void single_quote_string(void)
QObject *obj; QObject *obj;
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
str = qobject_to_qstring(obj); str = qobject_to_qstring(obj);
g_assert(str); g_assert(str);
g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0);
@ -809,7 +811,7 @@ static void utf8_string(void)
utf8_in = test_cases[i].utf8_in ?: test_cases[i].utf8_out; utf8_in = test_cases[i].utf8_in ?: test_cases[i].utf8_out;
json_out = test_cases[i].json_out ?: test_cases[i].json_in; json_out = test_cases[i].json_out ?: test_cases[i].json_in;
obj = qobject_from_json(json_in, NULL); obj = qobject_from_json(json_in, utf8_out ? &error_abort : NULL);
if (utf8_out) { if (utf8_out) {
str = qobject_to_qstring(obj); str = qobject_to_qstring(obj);
g_assert(str); g_assert(str);
@ -836,7 +838,7 @@ static void utf8_string(void)
* FIXME Enable once these bugs have been fixed. * FIXME Enable once these bugs have been fixed.
*/ */
if (0 && json_out != json_in) { if (0 && json_out != json_in) {
obj = qobject_from_json(json_out, NULL); obj = qobject_from_json(json_out, &error_abort);
str = qobject_to_qstring(obj); str = qobject_to_qstring(obj);
g_assert(str); g_assert(str);
g_assert_cmpstr(qstring_get_str(str), ==, utf8_out); g_assert_cmpstr(qstring_get_str(str), ==, utf8_out);
@ -886,7 +888,8 @@ static void simple_number(void)
for (i = 0; test_cases[i].encoded; i++) { for (i = 0; test_cases[i].encoded; i++) {
QInt *qint; QInt *qint;
qint = qobject_to_qint(qobject_from_json(test_cases[i].encoded, NULL)); qint = qobject_to_qint(qobject_from_json(test_cases[i].encoded,
&error_abort));
g_assert(qint); g_assert(qint);
g_assert(qint_get_int(qint) == test_cases[i].decoded); g_assert(qint_get_int(qint) == test_cases[i].decoded);
if (test_cases[i].skip == 0) { if (test_cases[i].skip == 0) {
@ -920,7 +923,7 @@ static void float_number(void)
QObject *obj; QObject *obj;
QFloat *qfloat; QFloat *qfloat;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
qfloat = qobject_to_qfloat(obj); qfloat = qobject_to_qfloat(obj);
g_assert(qfloat); g_assert(qfloat);
g_assert(qfloat_get_double(qfloat) == test_cases[i].decoded); g_assert(qfloat_get_double(qfloat) == test_cases[i].decoded);
@ -965,7 +968,7 @@ static void keyword_literal(void)
QObject *null; QObject *null;
QString *str; QString *str;
obj = qobject_from_json("true", NULL); obj = qobject_from_json("true", &error_abort);
qbool = qobject_to_qbool(obj); qbool = qobject_to_qbool(obj);
g_assert(qbool); g_assert(qbool);
g_assert(qbool_get_bool(qbool) == true); g_assert(qbool_get_bool(qbool) == true);
@ -976,7 +979,7 @@ static void keyword_literal(void)
QDECREF(qbool); QDECREF(qbool);
obj = qobject_from_json("false", NULL); obj = qobject_from_json("false", &error_abort);
qbool = qobject_to_qbool(obj); qbool = qobject_to_qbool(obj);
g_assert(qbool); g_assert(qbool);
g_assert(qbool_get_bool(qbool) == false); g_assert(qbool_get_bool(qbool) == false);
@ -998,7 +1001,7 @@ static void keyword_literal(void)
g_assert(qbool_get_bool(qbool) == true); g_assert(qbool_get_bool(qbool) == true);
QDECREF(qbool); QDECREF(qbool);
obj = qobject_from_json("null", NULL); obj = qobject_from_json("null", &error_abort);
g_assert(obj != NULL); g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QNULL); g_assert(qobject_type(obj) == QTYPE_QNULL);
@ -1134,13 +1137,13 @@ static void simple_dict(void)
QObject *obj; QObject *obj;
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
str = qobject_to_json(obj); str = qobject_to_json(obj);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(qstring_get_str(str), NULL); obj = qobject_from_json(qstring_get_str(str), &error_abort);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);
QDECREF(str); QDECREF(str);
@ -1192,7 +1195,7 @@ static void large_dict(void)
QObject *obj; QObject *obj;
gen_test_json(gstr, 10, 100); gen_test_json(gstr, 10, 100);
obj = qobject_from_json(gstr->str, NULL); obj = qobject_from_json(gstr->str, &error_abort);
g_assert(obj != NULL); g_assert(obj != NULL);
qobject_decref(obj); qobject_decref(obj);
@ -1243,13 +1246,13 @@ static void simple_list(void)
QObject *obj; QObject *obj;
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
str = qobject_to_json(obj); str = qobject_to_json(obj);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(qstring_get_str(str), NULL); obj = qobject_from_json(qstring_get_str(str), &error_abort);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);
QDECREF(str); QDECREF(str);
@ -1305,13 +1308,13 @@ static void simple_whitespace(void)
QObject *obj; QObject *obj;
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded, NULL); obj = qobject_from_json(test_cases[i].encoded, &error_abort);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
str = qobject_to_json(obj); str = qobject_to_json(obj);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(qstring_get_str(str), NULL); obj = qobject_from_json(qstring_get_str(str), &error_abort);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);
@ -1332,7 +1335,7 @@ static void simple_varargs(void)
{}})), {}})),
{}})); {}}));
embedded_obj = qobject_from_json("[32, 42]", NULL); embedded_obj = qobject_from_json("[32, 42]", &error_abort);
g_assert(embedded_obj != NULL); g_assert(embedded_obj != NULL);
obj = qobject_from_jsonf("[%d, 2, %p]", 1, embedded_obj); obj = qobject_from_jsonf("[%d, 2, %p]", 1, embedded_obj);
@ -1344,68 +1347,87 @@ static void simple_varargs(void)
static void empty_input(void) static void empty_input(void)
{ {
const char *empty = ""; const char *empty = "";
QObject *obj = qobject_from_json(empty, &error_abort);
QObject *obj = qobject_from_json(empty, NULL);
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_string(void) static void unterminated_string(void)
{ {
QObject *obj = qobject_from_json("\"abc", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("\"abc", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_sq_string(void) static void unterminated_sq_string(void)
{ {
QObject *obj = qobject_from_json("'abc", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("'abc", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_escape(void) static void unterminated_escape(void)
{ {
QObject *obj = qobject_from_json("\"abc\\\"", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("\"abc\\\"", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_array(void) static void unterminated_array(void)
{ {
QObject *obj = qobject_from_json("[32", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("[32", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_array_comma(void) static void unterminated_array_comma(void)
{ {
QObject *obj = qobject_from_json("[32,", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("[32,", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void invalid_array_comma(void) static void invalid_array_comma(void)
{ {
QObject *obj = qobject_from_json("[32,}", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("[32,}", &err);
error_free_or_abort(&err);
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_dict(void) static void unterminated_dict(void)
{ {
QObject *obj = qobject_from_json("{'abc':32", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("{'abc':32", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_dict_comma(void) static void unterminated_dict_comma(void)
{ {
QObject *obj = qobject_from_json("{'abc':32,", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("{'abc':32,", &err);
g_assert(!err); /* BUG */
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void invalid_dict_comma(void) static void invalid_dict_comma(void)
{ {
QObject *obj = qobject_from_json("{'abc':32,}", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("{'abc':32,}", &err);
error_free_or_abort(&err);
g_assert(obj == NULL); g_assert(obj == NULL);
} }
static void unterminated_literal(void) static void unterminated_literal(void)
{ {
QObject *obj = qobject_from_json("nul", NULL); Error *err = NULL;
QObject *obj = qobject_from_json("nul", &err);
error_free_or_abort(&err);
g_assert(obj == NULL); g_assert(obj == NULL);
} }
@ -1421,15 +1443,17 @@ static char *make_nest(char *buf, size_t cnt)
static void limits_nesting(void) static void limits_nesting(void)
{ {
Error *err = NULL;
enum { max_nesting = 1024 }; /* see qobject/json-streamer.c */ enum { max_nesting = 1024 }; /* see qobject/json-streamer.c */
char buf[2 * (max_nesting + 1) + 1]; char buf[2 * (max_nesting + 1) + 1];
QObject *obj; QObject *obj;
obj = qobject_from_json(make_nest(buf, max_nesting), NULL); obj = qobject_from_json(make_nest(buf, max_nesting), &error_abort);
g_assert(obj != NULL); g_assert(obj != NULL);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(make_nest(buf, max_nesting + 1), NULL); obj = qobject_from_json(make_nest(buf, max_nesting + 1), &err);
error_free_or_abort(&err);
g_assert(obj == NULL); g_assert(obj == NULL);
} }