diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-28 22:27:05 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-03-07 16:07:47 +0100 |
| commit | f740048323398ebde9575a5730bf6d9f2a237f08 (patch) | |
| tree | a7fcd911721549b578079bcd8dec05849398a286 /tests/test-keyval.c | |
| parent | 069b64e3fe75c81edef6685c9941a7937a48fec4 (diff) | |
| download | qemu-f740048323398ebde9575a5730bf6d9f2a237f08.zip qemu-f740048323398ebde9575a5730bf6d9f2a237f08.tar.gz qemu-f740048323398ebde9575a5730bf6d9f2a237f08.tar.bz2 | |
keyval: Restrict key components to valid QAPI names
Until now, key components are separated by '.'. This leaves little
room for evolving the syntax, and is incompatible with the __RFQDN_
prefix convention for downstream extensions.
Since key components will be commonly used as QAPI member names by the
QObject input visitor, we can just as well borrow the QAPI naming
rules here: letters, digits, hyphen and period starting with a letter,
with an optional __RFQDN_ prefix for downstream extensions.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-20-git-send-email-armbru@redhat.com>
Diffstat (limited to 'tests/test-keyval.c')
| -rw-r--r-- | tests/test-keyval.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/test-keyval.c b/tests/test-keyval.c index 1c2aeea..efe27cd 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -41,6 +41,11 @@ static void test_keyval_parse(void) error_free_or_abort(&err); g_assert(!qdict); + /* Invalid non-empty key (qemu_opts_parse() doesn't care) */ + qdict = keyval_parse("7up=val", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + /* Overlong key */ memset(long_key, 'a', 127); long_key[127] = 'z'; @@ -73,6 +78,11 @@ static void test_keyval_parse(void) QDECREF(qdict); g_free(params); + /* Crap after valid key */ + qdict = keyval_parse("key[0]=val", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + /* Multiple keys, last one wins */ qdict = keyval_parse("a=1,b=2,,x,a=3", NULL, &error_abort); g_assert_cmpuint(qdict_size(qdict), ==, 2); |