diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index 45ce918..94d868f 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -1452,7 +1452,7 @@ diff -urNp coreutils-8.22-orig/src/join.c coreutils-8.22/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]);) + { @@ -3852,7 +3852,7 @@ diff -urNp coreutils-8.22-orig/src/uniq.c coreutils-8.22/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.spec b/coreutils.spec index 441b4ef..5238e50 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.22 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -372,6 +372,10 @@ fi %{_sbindir}/chroot %changelog +* Thu Dec 19 2013 Ondrej Vasik 8.22-2 +- reset buffer before copying to prevent some rare cases of + invalid output in join and uniq(#1036289) + * Sat Dec 14 2013 Ondrej Vasik 8.22-1 - new upstream version 8.22 - temporarily disable multibyte cut.pl part and df symlink