diff options
| author | Markus Armbruster | 2018-08-23 18:40:05 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2018-08-24 20:26:37 +0200 |
| commit | 2cbd15aa6f4d4694376dd0d231d56e572ac870c1 (patch) | |
| tree | 80bffd7131ee398510fb7961dfc0cb2982bed852 /tests | |
| parent | json: Rename token JSON_ESCAPE & friends to JSON_INTERP (diff) | |
| download | qemu-2cbd15aa6f4d4694376dd0d231d56e572ac870c1.tar.gz qemu-2cbd15aa6f4d4694376dd0d231d56e572ac870c1.tar.xz qemu-2cbd15aa6f4d4694376dd0d231d56e572ac870c1.zip | |
json: Treat unwanted interpolation as lexical error
The JSON parser optionally supports interpolation. The lexer
recognizes interpolation tokens unconditionally. The parser rejects
them when interpolation is disabled, in parse_interpolation().
However, it neglects to set an error then, which can make
json_parser_parse() fail without setting an error.
Move the check for unwanted interpolation from the parser's
parse_interpolation() into the lexer's finite state machine. When
interpolation is disabled, '%' is now handled like any other
unexpected character.
The next commit will improve how such lexical errors are handled.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-39-armbru@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmp-test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 7b3ba17c4a..4ae2245484 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -94,6 +94,10 @@ static void test_malformed(QTestState *qts) /* lexical error: interpolation */ qtest_qmp_send_raw(qts, "%%p\n"); + /* two errors, one for "%", one for "p" */ + resp = qtest_qmp_receive(qts); + g_assert_cmpstr(get_error_class(resp), ==, "GenericError"); + qobject_unref(resp); resp = qtest_qmp_receive(qts); g_assert_cmpstr(get_error_class(resp), ==, "GenericError"); qobject_unref(resp); |