shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

shared/fstab-util: pass through the escape character

Browse Source 
… when not used to escape the separator (,) or the escape character (\).
This mostly restores behaviour from before 0645b83a40,
but still allows "," to be escaped.

Partially fixes #18952.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-03-10 16:53:38 +01:00
parent 3141089f53
commit 0264b404b9
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/fstab-util.c
View File

@ -97,16 +97,18 @@ int fstab_filter_options(const char *opts, const char *names,
for (const char *word = opts;;) {
const char *end = word;
/* Look for an *non-escaped* comma separator. Only commas can be escaped, so "\," is
* the only valid escape sequence, so we can do a very simple test here. */
/* Look for a *non-escaped* comma separator. Only commas and backslashes can be
* escaped, so "\," and "\\" are the only valid escape sequences, and we can do a
* very simple test here. */
for (;;) {
size_t n = strcspn(end, ",");
end += strcspn(end, ",\\");
end += n;
if (n > 0 && end[-1] == '\\')
end++;
else
if (IN_SET(*end, ',', '\0'))
break;
assert(*end == '\\');
end ++; /* Skip the backslash */
if (*end != '\0')
end ++; /* Skip the escaped char, but watch out for a trailing commma */
}
NULSTR_FOREACH(name, names) {
@ -140,7 +142,9 @@ int fstab_filter_options(const char *opts, const char *names,
break;
}
} else {
r = strv_split_full(&stor, opts, ",", EXTRACT_UNESCAPE_SEPARATORS);
/* For backwards compatibility, we need to pass-through escape characters.
* The only ones we "consume" are the ones used as "\," or "\\". */
r = strv_split_full(&stor, opts, ",", EXTRACT_UNESCAPE_SEPARATORS | EXTRACT_UNESCAPE_RELAX);
if (r < 0)
return r;

4
src/test/test-fstab-util.c
View File

@ -98,6 +98,10 @@ static void test_fstab_filter_options(void) {
/* unnecessary comma separators */
do_fstab_filter_options("opt=x,,,,", "opt\0", 1, "opt", "x", "");
do_fstab_filter_options(",,,opt=x,,,,", "opt\0", 1, "opt", "x", "");
/* escaped characters */
do_fstab_filter_options("opt1=\\\\,opt2=\\xff", "opt1\0", 1, "opt1", "\\", "opt2=\\xff");
do_fstab_filter_options("opt1=\\\\,opt2=\\xff", "opt2\0", 1, "opt2", "\\xff", "opt1=\\");
}
static void test_fstab_find_pri(void) {