[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/10] keyval: Fix parsing of ',' in value of implied key
From: |
Kevin Wolf |
Subject: |
[PULL 03/10] keyval: Fix parsing of ',' in value of implied key |
Date: |
Thu, 15 Oct 2020 16:49:45 +0200 |
From: Markus Armbruster <armbru@redhat.com>
The previous commit demonstrated documentation and code disagree on
parsing of ',' in the value of an implied key. Fix the code to match
the documentation.
This breaks uses of keyval_parse() that pass an implied key and accept
a value containing ','. None of the existing uses does:
* audiodev: implied key "driver" is enum AudiodevDriver, none of the
values contains ','
* display: implied key "type" is enum DisplayType, none of the values
contains ','
* blockdev: implied key "driver is enum BlockdevDriver, none of the
values contains ','
* export: implied key "type" is enum BlockExportType, none of the
values contains ','
* monitor: implied key "mode" is enum MonitorMode, none of the values
contains ','
* nbd-server: no implied key.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201011073505.1185335-4-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-keyval.c | 8 +++-----
util/keyval.c | 28 +++++++++++++++++-----------
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/tests/test-keyval.c b/tests/test-keyval.c
index f02bdf7029..04c62cf045 100644
--- a/tests/test-keyval.c
+++ b/tests/test-keyval.c
@@ -183,11 +183,9 @@ static void test_keyval_parse(void)
g_assert(!qdict);
/* Implied key's value can't have comma (qemu_opts_parse(): it can) */
- /* BUG: it can */
- qdict = keyval_parse("val,,ue", "implied", &error_abort);
- g_assert_cmpuint(qdict_size(qdict), ==, 1);
- g_assert_cmpstr(qdict_get_try_str(qdict, "implied"), ==, "val,ue");
- qobject_unref(qdict);
+ qdict = keyval_parse("val,,ue", "implied", &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
/* Empty key is not an implied key */
qdict = keyval_parse("=val", "implied", &err);
diff --git a/util/keyval.c b/util/keyval.c
index 82d8497c71..8f33a36a7c 100644
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -173,7 +173,7 @@ static const char *keyval_parse_one(QDict *qdict, const
char *params,
const char *implied_key,
Error **errp)
{
- const char *key, *key_end, *s, *end;
+ const char *key, *key_end, *val_end, *s, *end;
size_t len;
char key_in_cur[128];
QDict *cur;
@@ -182,10 +182,12 @@ static const char *keyval_parse_one(QDict *qdict, const
char *params,
QString *val;
key = params;
+ val_end = NULL;
len = strcspn(params, "=,");
if (implied_key && len && key[len] != '=') {
/* Desugar implied key */
key = implied_key;
+ val_end = params + len;
len = strlen(implied_key);
}
key_end = key + len;
@@ -241,7 +243,11 @@ static const char *keyval_parse_one(QDict *qdict, const
char *params,
if (key == implied_key) {
assert(!*s);
- s = params;
+ val = qstring_from_substr(params, 0, val_end - params);
+ s = val_end;
+ if (*s == ',') {
+ s++;
+ }
} else {
if (*s != '=') {
error_setg(errp, "Expected '=' after parameter '%.*s'",
@@ -249,19 +255,19 @@ static const char *keyval_parse_one(QDict *qdict, const
char *params,
return NULL;
}
s++;
- }
- val = qstring_new();
- for (;;) {
- if (!*s) {
- break;
- } else if (*s == ',') {
- s++;
- if (*s != ',') {
+ val = qstring_new();
+ for (;;) {
+ if (!*s) {
break;
+ } else if (*s == ',') {
+ s++;
+ if (*s != ',') {
+ break;
+ }
}
+ qstring_append_chr(val, *s++);
}
- qstring_append_chr(val, *s++);
}
if (!keyval_parse_put(cur, key_in_cur, val, key, key_end, errp)) {
--
2.28.0
- [PULL 00/10] Block layer patches, Kevin Wolf, 2020/10/15
- [PULL 01/10] keyval: Fix and clarify grammar, Kevin Wolf, 2020/10/15
- [PULL 02/10] test-keyval: Demonstrate misparse of ', ' with implied key, Kevin Wolf, 2020/10/15
- [PULL 03/10] keyval: Fix parsing of ',' in value of implied key,
Kevin Wolf <=
- [PULL 05/10] qom: Factor out helpers from user_creatable_print_help(), Kevin Wolf, 2020/10/15
- [PULL 06/10] qom: Add user_creatable_print_help_from_qdict(), Kevin Wolf, 2020/10/15
- [PULL 09/10] block: drop moderated sheepdog mailing list from MAINTAINERS file, Kevin Wolf, 2020/10/15
- [PULL 04/10] keyval: Parse help options, Kevin Wolf, 2020/10/15
- [PULL 07/10] qemu-storage-daemon: Remove QemuOpts from --object parser, Kevin Wolf, 2020/10/15
- [PULL 08/10] monitor: Fix order in monitor_cleanup(), Kevin Wolf, 2020/10/15
- [PULL 10/10] block: deprecate the sheepdog block driver, Kevin Wolf, 2020/10/15
- Re: [PULL 00/10] Block layer patches, Peter Maydell, 2020/10/16