SHA256
1
0
forked from pool/texlive
Dr. Werner Fink 2016-06-14 14:29:44 +00:00 committed by Git OBS Bridge
parent 20f7a93061
commit 44e2b8c1d4
3 changed files with 77 additions and 2 deletions

View File

@ -3,12 +3,13 @@ With perl-5.18.2 macros like
{\v S}
\s S
do not work.
do not work. Also fastsort causes trouble.
---
t/sort-order.t | 24 +-----------------------
t/tdata/names.bib | 4 ++--
t/utils.t | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
3 files changed, 4 insertions(+), 26 deletions(-)
--- t/utils.t
+++ t/utils.t 2016-02-03 11:03:21.266959058 +0000
@ -37,3 +38,50 @@ do not work.
}
@BOOK{L23,
--- t/sort-order.t
+++ t/sort-order.t 2016-06-14 14:21:07.085073233 +0000
@@ -4,7 +4,7 @@ use warnings;
use utf8;
no warnings 'utf8';
-use Test::More tests => 15;
+use Test::More tests => 14;
use Biber;
use Biber::Output::bbl;
@@ -32,7 +32,6 @@ $biber->set_output_obj(Biber::Output::bb
# Options - we could set these in the control file but it's nice to see what we're
# relying on here for tests
Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
-Biber::Config->setoption('fastsort', 1);
Biber::Config->setblxoption('labelyear', undef);
Biber::Config->setblxoption('labelalpha', 0);
@@ -482,27 +481,6 @@ $section = $biber->sections->get_section
is_deeply([$main->get_keys], ['L9','L6','L7','L8','L5','L4','L3','L2','L1B','L1A','L1'], 'nty with descending n');
-# testing case sensitive with fastsort
-# In alphabetic, all uppercase comes before lower so the
-# "sortcase => 1" on location means that "edinburgh" sorts at the end after "London"
-# Take this out of the location sorting spec and it fails as it should
-$S = { spec => [
- [
- {sortcase => 1},
- {'location' => {}}
- ]
- ]};
-
-$main->set_sortscheme($S);
-
-$biber->set_output_obj(Biber::Output::bbl->new());
-# Have to set locale to something which understands lexical/case differences for this test
-# otherwise testing on Windows doesn't work ...
-Biber::Config->setoption('sortlocale', 'C.UTF-8');
-$biber->prepare;
-$section = $biber->sections->get_section(0);
-is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
-
# Test nosort option
$S = { spec => [
[

View File

@ -29,3 +29,24 @@
+test -e $srcdir/test.old || > $srcdir/test.old
+diff $srcdir/test.old test.out || true
--- texk/upmendex/fwrite.c
+++ texk/upmendex/fwrite.c 2016-06-14 12:59:55.681041860 +0000
@@ -68,8 +68,8 @@ static inline int SAPPENDF(char *buf, co
static void fprint_uchar(FILE *fp, const UChar *a, const int mode, const int len)
{
int k;
- char str[15], *ret;
- UChar istr[5];
+ char str[16], *ret;
+ UChar istr[INITIALLENGTH+1];
int olen, wclen;
UErrorCode perr;
@@ -92,6 +92,7 @@ static void fprint_uchar(FILE *fp, const
perr = U_ZERO_ERROR;
u_strToTitle(istr,5,istr,wclen,NULL,"",&perr);
}
+ memset(&str[0], 0, sizeof(str));
perr = U_ZERO_ERROR;
ret = u_strToUTF8(str, 15, &olen, istr, wclen, &perr);
fprintf(fp,"%s",str);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 14 13:03:21 UTC 2016 - werner@suse.de
- Avoid stack smashing deteted on i586 in upmendex/fwrite.c
- With perl 5.18 fastsort does not work
-------------------------------------------------------------------
Tue Jun 7 11:35:15 UTC 2016 - werner@suse.de