From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, kwolf@redhat.com, pkrempa@redhat.com,
eblake@redhat.com, mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH v2 14/24] check-qjson: Test errors from qobject_from_json()
Date: Tue, 28 Feb 2017 22:27:00 +0100 [thread overview]
Message-ID: <1488317230-26248-15-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1488317230-26248-1-git-send-email-armbru@redhat.com>
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>
---
tests/check-qjson.c | 88 ++++++++++++++++++++++++++++++++++-------------------
1 file changed, 56 insertions(+), 32 deletions(-)
diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index aa63758..963dd46 100644
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -10,8 +10,10 @@
* See the COPYING.LIB file in the top-level directory.
*
*/
+
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "qapi/qmp/types.h"
#include "qapi/qmp/qjson.h"
#include "qemu-common.h"
@@ -53,7 +55,7 @@ static void escaped_string(void)
QObject *obj;
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);
g_assert(str);
g_assert_cmpstr(qstring_get_str(str), ==, test_cases[i].decoded);
@@ -85,7 +87,7 @@ static void simple_string(void)
QObject *obj;
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);
g_assert(str);
g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0);
@@ -116,7 +118,7 @@ static void single_quote_string(void)
QObject *obj;
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);
g_assert(str);
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;
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) {
str = qobject_to_qstring(obj);
g_assert(str);
@@ -836,7 +838,7 @@ static void utf8_string(void)
* FIXME Enable once these bugs have been fixed.
*/
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);
g_assert(str);
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++) {
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_get_int(qint) == test_cases[i].decoded);
if (test_cases[i].skip == 0) {
@@ -920,7 +923,7 @@ static void float_number(void)
QObject *obj;
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);
g_assert(qfloat);
g_assert(qfloat_get_double(qfloat) == test_cases[i].decoded);
@@ -965,7 +968,7 @@ static void keyword_literal(void)
QObject *null;
QString *str;
- obj = qobject_from_json("true", NULL);
+ obj = qobject_from_json("true", &error_abort);
qbool = qobject_to_qbool(obj);
g_assert(qbool);
g_assert(qbool_get_bool(qbool) == true);
@@ -976,7 +979,7 @@ static void keyword_literal(void)
QDECREF(qbool);
- obj = qobject_from_json("false", NULL);
+ obj = qobject_from_json("false", &error_abort);
qbool = qobject_to_qbool(obj);
g_assert(qbool);
g_assert(qbool_get_bool(qbool) == false);
@@ -998,7 +1001,7 @@ static void keyword_literal(void)
g_assert(qbool_get_bool(qbool) == true);
QDECREF(qbool);
- obj = qobject_from_json("null", NULL);
+ obj = qobject_from_json("null", &error_abort);
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QNULL);
@@ -1134,13 +1137,13 @@ static void simple_dict(void)
QObject *obj;
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);
str = qobject_to_json(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);
qobject_decref(obj);
QDECREF(str);
@@ -1192,7 +1195,7 @@ static void large_dict(void)
QObject *obj;
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);
qobject_decref(obj);
@@ -1243,13 +1246,13 @@ static void simple_list(void)
QObject *obj;
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);
str = qobject_to_json(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);
qobject_decref(obj);
QDECREF(str);
@@ -1305,13 +1308,13 @@ static void simple_whitespace(void)
QObject *obj;
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);
str = qobject_to_json(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);
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);
obj = qobject_from_jsonf("[%d, 2, %p]", 1, embedded_obj);
@@ -1344,68 +1347,87 @@ static void simple_varargs(void)
static void empty_input(void)
{
const char *empty = "";
-
- QObject *obj = qobject_from_json(empty, NULL);
+ QObject *obj = qobject_from_json(empty, &error_abort);
g_assert(obj == NULL);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
@@ -1421,15 +1443,17 @@ static char *make_nest(char *buf, size_t cnt)
static void limits_nesting(void)
{
+ Error *err = NULL;
enum { max_nesting = 1024 }; /* see qobject/json-streamer.c */
char buf[2 * (max_nesting + 1) + 1];
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);
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);
}
--
2.7.4
next prev parent reply other threads:[~2017-02-28 21:27 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 21:26 [Qemu-devel] [PATCH v2 00/24] block: Command line option -blockdev Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 01/24] test-qemu-opts: Cover qemu_opts_parse() of "no" Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 03/24] keyval: New keyval_parse() Markus Armbruster
2017-02-28 21:48 ` Eric Blake
2017-02-28 22:01 ` Markus Armbruster
2017-03-05 10:07 ` Markus Armbruster
2017-02-28 22:03 ` Kevin Wolf
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 04/24] qapi: qobject input visitor variant for use with keyval_parse() Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 05/24] test-keyval: Cover use with qobject input visitor Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 06/24] qapi: Factor out common part of qobject input visitor creation Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 07/24] qapi: Factor out common qobject_input_get_keyval() Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 08/24] qobject: Propagate parse errors through qobject_from_jsonv() Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 10/24] qjson: Abort earlier on qobject_from_jsonf() misuse Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 11/24] test-qobject-input-visitor: Abort earlier on bad test input Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 12/24] qobject: Propagate parse errors through qobject_from_json() Markus Armbruster
2017-02-28 21:26 ` [Qemu-devel] [PATCH v2 13/24] block: More detailed syntax error reporting for JSON filenames Markus Armbruster
2017-02-28 21:27 ` Markus Armbruster [this message]
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json() Markus Armbruster
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 16/24] monitor: Assert qmp_schema_json[] is sane Markus Armbruster
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 17/24] test-qapi-util: New, covering qapi/qapi-util.c Markus Armbruster
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 18/24] qapi: New parse_qapi_name() Markus Armbruster
2017-02-28 22:04 ` Kevin Wolf
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 19/24] keyval: Restrict key components to valid QAPI names Markus Armbruster
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 20/24] qapi: New qobject_input_visitor_new_str() for convenience Markus Armbruster
2017-02-28 22:05 ` Kevin Wolf
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 21/24] block: Initial implementation of -blockdev Markus Armbruster
2017-02-28 22:05 ` Kevin Wolf
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 22/24] qapi: Improve how keyval input visitor reports unexpected dicts Markus Armbruster
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 23/24] docs/qapi-code-gen.txt: Clarify naming rules Markus Armbruster
2017-02-28 21:27 ` [Qemu-devel] [PATCH v2 24/24] keyval: Support lists Markus Armbruster
2017-02-28 22:02 ` Kevin Wolf
2017-02-28 22:11 ` Markus Armbruster
2017-02-28 22:17 ` Kevin Wolf
2017-02-28 22:56 ` Eric Blake
2017-03-01 5:47 ` Markus Armbruster
2017-02-28 21:55 ` [Qemu-devel] [PATCH v2 00/24] block: Command line option -blockdev Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488317230-26248-15-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=pkrempa@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).