root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xzgrep: Add more LC_ALL=C to avoid bugs with multibyte characters. 

Also replace one use of expr with printf.

The rationale for LC_ALL=C was already mentioned in
69d1b3fc29 that fixed a security
issue. However, unrelated uses weren't changed in that commit yet.

POSIX says that with sed and such tools one should use LC_ALL=C
to ensure predictable behavior when strings contain byte sequences
that aren't valid multibyte characters in the current locale. See
under "Application usage" in here:

https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html

With GNU sed invalid multibyte strings would work without this;
it's documented in its Texinfo manual. Some other implementations
aren't so forgiving.
This commit is contained in:
Lasse Collin 2022-07-17 21:36:25 +03:00
parent b48f9d615f
commit 6a4a4a7d26
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripts/xzgrep.in
View File

@ -75,9 +75,10 @@ while test $# -ne 0; do
# For example, "grep -25F" is equivalent to "grep -C25 -F". If only # For example, "grep -25F" is equivalent to "grep -C25 -F". If only
# digits are specified like "grep -25" we don't get here because the # digits are specified like "grep -25" we don't get here because the
# above pattern in the case-statement doesn't match such strings. # above pattern in the case-statement doesn't match such strings.
arg2=-\'$(expr "X${option}X" : 'X-.[0-9]*\(.*\)' | sed "$escape") arg2=-\'$(LC_ALL=C expr "X${option}X" : 'X-.[0-9]*\(.*\)' |
LC_ALL=C sed "$escape")
eval "set -- $arg2 "'${1+"$@"}' eval "set -- $arg2 "'${1+"$@"}'
option=$(expr "X$option" : 'X\(-.[0-9]*\)');; option=$(LC_ALL=C expr "X$option" : 'X\(-.[0-9]*\)');;
(--binary-*=* | --[lm]a*=* | --reg*=*) (--binary-*=* | --[lm]a*=* | --reg*=*)
# These options require an argument and an argument has been provided # These options require an argument and an argument has been provided
# with the --foo=argument syntax. All is good. # with the --foo=argument syntax. All is good.
@ -87,7 +88,7 @@ while test $# -ne 0; do
# If it isn't, display an error and exit. # If it isn't, display an error and exit.
case ${1?"$option option requires an argument"} in case ${1?"$option option requires an argument"} in
(*\'*) (*\'*)
optarg=" '"$(printf '%sX\n' "$1" | sed "$escape");; optarg=" '"$(printf '%sX\n' "$1" | LC_ALL=C sed "$escape");;
(*) (*)
optarg=" '$1'";; optarg=" '$1'";;
esac esac
@ -99,7 +100,8 @@ while test $# -ne 0; do
(*) (*)
case $option in case $option in
(*\'*) (*\'*)
operands="$operands '"$(printf '%sX\n' "$option" | sed "$escape");; operands="$operands '"$(printf '%sX\n' "$option" |
LC_ALL=C sed "$escape");;
(*) (*)
operands="$operands '$option'";; operands="$operands '$option'";;
esac esac
@ -136,7 +138,7 @@ while test $# -ne 0; do
case $option in case $option in
(*\'?*) (*\'?*)
option=\'$(expr "X${option}X" : 'X\(.*\)' | sed "$escape");; option=\'$(printf '%sX\n' "$option" | LC_ALL=C sed "$escape");;
(*) (*)
option="'$option'";; option="'$option'";;
esac esac
@ -153,7 +155,7 @@ eval "set -- $operands "'${1+"$@"}'
if test $have_pat -eq 0; then if test $have_pat -eq 0; then
case ${1?"Missing pattern; try \`${0##*/} --help' for help"} in case ${1?"Missing pattern; try \`${0##*/} --help' for help"} in
(*\'*) (*\'*)
grep="$grep -- '"$(printf '%sX\n' "$1" | sed "$escape");; grep="$grep -- '"$(printf '%sX\n' "$1" | LC_ALL=C sed "$escape");;
(*) (*)
grep="$grep -- '$1'";; grep="$grep -- '$1'";;
esac esac