Skip to content

V
varnish-cache
Commit a167b7e4 authored by Walid Boudebouda's avatar Walid Boudebouda
Browse files
Options

vav: Don't reject individually quoted arguments with ARGV_COMMA

parent 57c23063
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
lib/libvarnish/vav.c
View file @ a167b7e4
...@@ -192,6 +192,12 @@ VAV_ParseTxt(const char *b, const char *e, int *argc, int flag) ...@@ -192,6 +192,12 @@ VAV_ParseTxt(const char *b, const char *e, int *argc, int flag)
b++; b++;
continue; continue;
} }
if (sep != NULL && *sep == '"' &&
*b == ',' && (flag & ARGV_COMMA)) {
sep = NULL;
b++;
continue;
}
if (sep != NULL && *sep == '"' && *b == '"' && (b - sep) < 2) { if (sep != NULL && *sep == '"' && *b == '"' && (b - sep) < 2) {
argv[0] = err_missing_separator; argv[0] = err_missing_separator;
return (argv); return (argv);
...@@ -402,6 +408,7 @@ static const struct test_case *tests[] = { ...@@ -402,6 +408,7 @@ static const struct test_case *tests[] = {
TEST_FAIL(0 , "foo\"bar", invalid_quote), TEST_FAIL(0 , "foo\"bar", invalid_quote),
TEST_FAIL(0 , "foo\"bar", invalid_quote), TEST_FAIL(0 , "foo\"bar", invalid_quote),
TEST_PASS(0 , "\"foo\" \"bar\"", "foo", "bar"), TEST_PASS(0 , "\"foo\" \"bar\"", "foo", "bar"),
TEST_PASS( C , "\"foo\",\"bar\"", "foo", "bar"),
TEST_PASS( N, "\"foo\"\"bar\"", "\"foo\"\"bar\""), TEST_PASS( N, "\"foo\"\"bar\"", "\"foo\"\"bar\""),
TEST_FAIL(0 , "\"foo\"\"bar\"", missing_separator), TEST_FAIL(0 , "\"foo\"\"bar\"", missing_separator),
NULL NULL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment