From edd1210fec9c0698b5eff74d42db0aab7747f026d8e59114d3912bec00a78684 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Thu, 19 Dec 2013 23:25:35 +0000 Subject: [PATCH] Accepting request 211785 from home:bernhard-voelker:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/211785 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=215 --- coreutils-i18n.patch | 4 ++-- coreutils-testsuite.changes | 7 +++++++ coreutils.changes | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index 2d04311..adcc408 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -1498,7 +1498,7 @@ Index: src/join.c + for (i = 0; i < 2; i++) + { + mallocd = 1; -+ copy[i] = xmalloc (len[i] + 1); ++ copy[i] = xcalloc (0, len[i] + 1); + + for (j = 0; j < MIN (len[0], len[1]);) + { @@ -3902,7 +3902,7 @@ Index: src/uniq.c + + for (i = 0; i < 2; i++) + { -+ copy[i] = xmalloc (len[i] + 1); ++ copy[i] = xcalloc (0, len[i] + 1); + + for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++) + { diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index bbed790..b2028ba 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 19 22:54:26 UTC 2013 - mail@bernhard-voelker.de + +- Fix issue with binary input in non-C locale (rh#1036289) + (coreutils-i18n.patch): Initialize memory for some edge cases + in the i18n patch for uniq and join. + ------------------------------------------------------------------- Wed Dec 11 20:22:47 UTC 2013 - mail@bernhard-voelker.de diff --git a/coreutils.changes b/coreutils.changes index bbed790..b2028ba 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 19 22:54:26 UTC 2013 - mail@bernhard-voelker.de + +- Fix issue with binary input in non-C locale (rh#1036289) + (coreutils-i18n.patch): Initialize memory for some edge cases + in the i18n patch for uniq and join. + ------------------------------------------------------------------- Wed Dec 11 20:22:47 UTC 2013 - mail@bernhard-voelker.de