Commit 00382fa8 authored Dec 06, 2018 by Markus Armbruster

json: Fix to reject duplicate object member names



The JSON parser happily accepts duplicate object member names.  The
last value wins.  Reproducer #1:

    $ qemu-system-x86_64 -qmp stdio
    {"QMP": {"version": {"qemu": {"micro": 93, "minor": 0, "major": 3},
    "package": "v3.1.0-rc3-7-g87a45d86ed"}, "capabilities": []}}
    {'execute':'qmp_capabilities'}
    {"return": {}}
    {'execute':'blockdev-add','arguments':{'driver':'null-co',
     'node-name':'foo','node-name':'bar'}}
    {"return": {}}
    {'execute':'query-named-block-nodes'}
    {"return": [{ [...] "node-name": "bar" [...] }]}

Reproducer #2 is iotest 229.

Fix the parser to reject duplicates, and fix iotest 229 not to use
them.

Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20181206121743.20762-1-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Trailing whitespace tidied up]
Signed-off-by: Markus Armbruster <armbru@redhat.com>

parent aee03bf3

qobject/json-parser.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,11 @@ static int parse_pair(JSONParserContext ctxt, QDict dict)
		goto out;
		}

		if (qdict_haskey(dict, qstring_get_str(key))) {
		parse_error(ctxt, token, "duplicate key");
		goto out;
		}

		qdict_put_obj(dict, qstring_get_str(key), value);

		qobject_unref(key);

tests/qemu-iotests/229

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ echo
		_send_qemu_cmd $QEMU_HANDLE \
		"{'execute': 'drive-mirror',
		'arguments': {'device': 'testdisk',
		'mode': 'absolute-paths',
		'format': '$IMGFMT',
		'target': '$DEST_IMG',
		'sync': 'full',