mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-11 07:40:05 +00:00
0f9e585480
[Modified from the original email by Siddhesh Poyarekar] This patch solves bug #16009 by implementing an additional path in strxfrm that does not depend on caching the weight and rule indices. In detail the following changed: * The old main loop was factored out of strxfrm_l into the function do_xfrm_cached to be able to alternativly use the non-caching version do_xfrm. * strxfrm_l allocates a a fixed size array on the stack. If this is not sufficiant to store the weight and rule indices, the non-caching path is taken. As the cache size is not dependent on the input there can be no problems with integer overflows or stack allocations greater than __MAX_ALLOCA_CUTOFF. Note that malloc-ing is not possible because the definition of strxfrm does not allow an oom errorhandling. * The uncached path determines the weight and rule index for every char and for every pass again. * Passing all the locale data array by array resulted in very long parameter lists, so I introduced a structure that holds them. * Checking for zero src string has been moved a bit upwards, it is before the locale data initialization now. * To verify that the non-caching path works correct I added a test run to localedata/sort-test.sh & localedata/xfrm-test.c where all strings are patched up with spaces so that they are too large for the caching path.
76 lines
2.4 KiB
Bash
76 lines
2.4 KiB
Bash
#! /bin/sh
|
|
# Test collation using xfrm-test.
|
|
# Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
set -e
|
|
|
|
common_objpfx=$1; shift
|
|
test_program_prefix_before_env=$1; shift
|
|
run_program_env=$1; shift
|
|
test_program_prefix_after_env=$1; shift
|
|
lang=$*
|
|
|
|
id=${PPID:-100}
|
|
here=`pwd`
|
|
|
|
# Run collation tests.
|
|
status=0
|
|
for l in $lang; do
|
|
here=0
|
|
cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
|
|
${test_program_prefix_before_env} \
|
|
${run_program_env} \
|
|
LC_ALL=$l ${test_program_prefix_after_env} \
|
|
${common_objpfx}localedata/collate-test $id < $cns.in \
|
|
> ${common_objpfx}localedata/$cns.out || here=1
|
|
cmp -s $cns.in ${common_objpfx}localedata/$cns.out || here=1
|
|
if test $here -eq 0; then
|
|
echo "$l collate-test OK"
|
|
else
|
|
echo "$l collate-test FAIL"
|
|
diff -u $cns.in ${common_objpfx}localedata/$cns.out | sed 's/^/ /'
|
|
status=1
|
|
fi
|
|
|
|
${test_program_prefix_before_env} \
|
|
${run_program_env} \
|
|
LC_ALL=$l ${test_program_prefix_after_env} \
|
|
${common_objpfx}localedata/xfrm-test $id < $cns.in \
|
|
> ${common_objpfx}localedata/$cns.xout || here=1
|
|
cmp -s $cns.in ${common_objpfx}localedata/$cns.xout || here=1
|
|
${test_program_prefix_before_env} \
|
|
${run_program_env} \
|
|
LC_ALL=$l ${test_program_prefix_after_env} \
|
|
${common_objpfx}localedata/xfrm-test $id -nocache < $cns.in \
|
|
> ${common_objpfx}localedata/$cns.nocache.xout || here=1
|
|
cmp -s $cns.in ${common_objpfx}localedata/$cns.nocache.xout || here=1
|
|
if test $here -eq 0; then
|
|
echo "$l xfrm-test OK"
|
|
else
|
|
echo "$l xfrm-test FAIL"
|
|
diff -u $cns.in ${common_objpfx}localedata/$cns.xout | sed 's/^/ /'
|
|
diff -u $cns.in ${common_objpfx}localedata/$cns.nocache.xout | sed 's/^/ /'
|
|
status=1
|
|
fi
|
|
done
|
|
|
|
exit $status
|
|
# Local Variables:
|
|
# mode:shell-script
|
|
# End:
|