mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-31 11:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-img: Move is_valid_option_list() to qemu-img.c and rewrite

Browse Source 
is_valid_option_list()'s purpose is ensuring qemu-img.c's can safely
join multiple parameter strings separated by ',' like this:

        g_strdup_printf("%s,%s", params1, params2);

How it does that is anything but obvious.  A close reading of the code
reveals that it fails exactly when its argument starts with ',' or
ends with an odd number of ','.  Makes sense, actually, because when
the argument starts with ',', a separating ',' preceding it would get
escaped, and when it ends with an odd number of ',', a separating ','
following it would get escaped.

Move it to qemu-img.c and rewrite it the obvious way.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200415074927.19897-9-armbru@redhat.com>
This commit is contained in:
Markus Armbruster
2020-04-15 09:49:26 +02:00
parent 6d2b5cbafb
commit 80c710cb06
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
util/qemu-option.c
View File

@ -165,28 +165,6 @@ void parse_option_size(const char *name, const char *value,
*ret = size;
}
bool is_valid_option_list(const char *p)
{
char *value = NULL;
bool result = false;
while (*p) {
p = get_opt_value(p, &value);
if ((*p && !*++p) ||
(!*value || *value == ',')) {
goto out;
}
g_free(value);
value = NULL;
}
result = true;
out:
g_free(value);
return result;
}
static const char *opt_type_to_string(enum QemuOptType type)
{
switch (type) {