diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-04-14 13:04:13 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2017-04-18 12:46:20 +0100 |
| commit | 01019f2bb433c8c12ba4f58e428c3fc506e41632 (patch) | |
| tree | ea2dd2010f7e5f550269f41c27260e4bdaf028aa /test | |
| parent | ef628c3b0afa0b1effdfdf273f8cbacaff969e31 (diff) | |
| download | dbus-01019f2bb433c8c12ba4f58e428c3fc506e41632.tar.gz | |
Ensure hyphen/minus is treated as literal in regexes
Each U+002D HYPHEN-MINUS in [0-9A-Za-z_-/.\] is treated as a member of a
range. The third one, which appears to have been intended to be a
literal, is part of an empty range because the starting point
U+005F LOW LINE is greater than the endpoint U+002F SOLIDUS, resulting
in at least some grep implementations not considering U+002D, U+002F
or U+005F to match the pattern. This resulted in one of the
dbus-launch tests being unintentionally skipped when it used a
regex based on the one in the spec.
regex(7) suggests "To include a literal '-' [in a bracketed character
set], make it the first or last character".
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100686
Diffstat (limited to 'test')
| -rwxr-xr-x | test/test-dbus-launch-x11.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-dbus-launch-x11.sh b/test/test-dbus-launch-x11.sh index be0f4f3c..8f049101 100755 --- a/test/test-dbus-launch-x11.sh +++ b/test/test-dbus-launch-x11.sh @@ -198,7 +198,7 @@ test_xdg_runtime_dir () { export XDG_RUNTIME_DIR="$workdir" fake_uuid="ffffffffffffffffffffffffffffffff" - if echo "$workdir" | grep '[^0-9A-Za-z_-/.]'; then + if echo "$workdir" | grep '[^-0-9A-Za-z_/.]'; then test_num=$(($test_num + 1)) echo "ok ${test_num} # SKIP - $workdir would need escaping" return |