diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c index 292b97cd692..1ddcd371cfc 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -140,7 +140,7 @@ int fstab_filter_options(const char *opts, const char *names, break; } } else { - r = strv_split_full(&stor, opts, ",", EXTRACT_DONT_COALESCE_SEPARATORS | EXTRACT_UNESCAPE_SEPARATORS); + r = strv_split_full(&stor, opts, ",", EXTRACT_UNESCAPE_SEPARATORS); if (r < 0) return r; diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c index 222ffbb2a75..ebbdd05ca62 100644 --- a/src/test/test-fstab-util.c +++ b/src/test/test-fstab-util.c @@ -91,9 +91,13 @@ static void test_fstab_filter_options(void) { do_fstab_filter_options("opt =0", "x-opt\0opt\0noopt\0x-noopt\0", 0, NULL, NULL, NULL); do_fstab_filter_options(" opt ", "opt\0x-opt\0", 0, NULL, NULL, NULL); - /* check function will NULL args */ + /* check function with NULL args */ do_fstab_filter_options(NULL, "opt\0", 0, NULL, NULL, ""); do_fstab_filter_options("", "opt\0", 0, NULL, NULL, ""); + + /* 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", ""); } static void test_fstab_find_pri(void) {