rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

reset buffer before copying to prevent some rare cases of invalid output in join and uniq(#1036289)

Browse Source
This commit is contained in:
Ondřej Vašík 2013-12-19 11:09:01 +01:00
parent 9268947eab
commit f1ce0c9000
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils-i18n.patch
View File

@ -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++) + for (i = 0; i < 2; i++)
+ { + {
+ mallocd = 1; + mallocd = 1;
+ copy[i] = xmalloc (len[i] + 1); + copy[i] = xcalloc (0, len[i] + 1);
+ +
+ for (j = 0; j < MIN (len[0], len[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++) + 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++) + for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++)
+ { + {

6
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.22 Version: 8.22
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -372,6 +372,10 @@ fi
%{_sbindir}/chroot %{_sbindir}/chroot
%changelog %changelog
* Thu Dec 19 2013 Ondrej Vasik <ovasik@redhat.com> 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 <ovasik@redhat.com> 8.22-1 * Sat Dec 14 2013 Ondrej Vasik <ovasik@redhat.com> 8.22-1
- new upstream version 8.22 - new upstream version 8.22
- temporarily disable multibyte cut.pl part and df symlink - temporarily disable multibyte cut.pl part and df symlink