ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

libpkgconf: argvsplit: fix escape handling in tokenizer (closes #163)

pull/164/head
William Pitcock 2017-12-14 22:41:14 -06:00
parent 6073a49229
commit cf96c562e1
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpkgconf/argvsplit.c
View File

@ -88,12 +88,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
*dst_iter++ = *src_iter; *dst_iter++ = *src_iter;
} }
else else
{
if (*src_iter == '\\')
*dst_iter++ = '\\';
*dst_iter++ = *src_iter; *dst_iter++ = *src_iter;
}
escaped = false; escaped = false;
} }
@ -101,7 +96,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
{ {
if (*src_iter == quote) if (*src_iter == quote)
quote = 0; quote = 0;
else if (*src_iter == '\\') else if (*src_iter == '\\' && quote != '\'')
escaped = true; escaped = true;
else else
*dst_iter++ = *src_iter; *dst_iter++ = *src_iter;

2
libpkgconf/fragment.c
View File

@ -405,7 +405,7 @@ fragment_should_quote(const pkgconf_fragment_t *frag)
(*src > 'Z' && *src < '^') || (*src > 'Z' && *src < '^') ||
(*src == '`') || (*src == '`') ||
(*src > 'z' && *src < '~') || (*src > 'z' && *src < '~') ||
(*src > '~')) && *src != '\\') (*src > '~')))
return true; return true;
} }

2
tests/parser.sh
View File

@ -118,7 +118,7 @@ escaped_backslash_body()
{ {
atf_check \ atf_check \
-e ignore \ -e ignore \
-o inline:"-IC:\\\\\\\\A \n" \ -o inline:"'-IC:\\A' \n" \
pkgconf --with-path=${selfdir}/lib1 --cflags escaped-backslash pkgconf --with-path=${selfdir}/lib1 --cflags escaped-backslash
} }