rpms/coreutils/devel coreutils-i18n.patch, 1.37, 1.38 coreutils.spec, 1.272, 1.273

Ondrej Vasik ovasik at fedoraproject.org
Thu Sep 10 10:36:58 UTC 2009


Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31495

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
fix double free error in fold for singlebyte locales (caused by multibyte patch)

coreutils-i18n.patch:
 coreutils-6.11/src/join.c               |  105 +++-
 coreutils-6.12-orig/src/join.c          |    5 
 coreutils-6.12/tests/Makefile.am        |    5 
 coreutils-6.12/tests/misc/cut           |    6 
 coreutils-6.8+/lib/linebuffer.h         |    8 
 coreutils-6.8+/src/cut.c                |  420 ++++++++++++++++++-
 coreutils-6.8+/src/expand.c             |  161 +++++++
 coreutils-6.8+/src/fold.c               |  309 +++++++++++++-
 coreutils-6.8+/src/join.c               |  237 ++++++++++-
 coreutils-6.8+/src/pr.c                 |  431 ++++++++++++++++++--
 coreutils-6.8+/src/sort.c               |  673 ++++++++++++++++++++++++++++++--
 coreutils-6.8+/src/unexpand.c           |  226 ++++++++++
 coreutils-6.8+/src/uniq.c               |  259 +++++++++++-
 coreutils-6.8+/tests/misc/mb1.I         |    4 
 coreutils-6.8+/tests/misc/mb1.X         |    4 
 coreutils-6.8+/tests/misc/mb2.I         |    4 
 coreutils-6.8+/tests/misc/mb2.X         |    4 
 coreutils-6.8+/tests/misc/sort-mb-tests |   58 ++
 18 files changed, 2739 insertions(+), 180 deletions(-)

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- coreutils-i18n.patch	8 Sep 2009 14:34:31 -0000	1.37
+++ coreutils-i18n.patch	10 Sep 2009 10:36:58 -0000	1.38
@@ -1348,7 +1348,7 @@ diff -urNp coreutils-6.11-orig/src/join.
  	      /* Look for the last blank. */
  	      while (logical_end)
  		{
-@@ -218,11 +255,225 @@
+@@ -218,11 +255,222 @@
        line_out[offset_out++] = c;
      }
  
@@ -1358,7 +1358,6 @@ diff -urNp coreutils-6.11-orig/src/join.
 +  if (offset_out)
 +    fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
 +
-+  free(line_out);
 +}
 +
 +#if HAVE_MBRTOWC
@@ -1367,16 +1366,16 @@ diff -urNp coreutils-6.11-orig/src/join.
 +{
 +  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
 +  size_t buflen = 0;	/* The length of the byte sequence in buf. */
-+  char *bufpos;         /* Next read position of BUF. */
++  char *bufpos = NULL;         /* Next read position of BUF. */
 +  wint_t wc;		/* A gotten wide character. */
 +  size_t mblength;	/* The byte size of a multibyte character which shows
 +			   as same character as WC. */
 +  mbstate_t state, state_bak;	/* State of the stream. */
 +  int convfail;		/* 1, when conversion is failed. Otherwise 0. */
 +
-+  char *line_out = NULL;
++  static char *line_out = NULL;
 +  size_t offset_out = 0;	/* Index in `line_out' for next char. */
-+  size_t allocated_out = 0;
++  static size_t allocated_out = 0;
 +
 +  int increment;
 +  size_t column = 0;
@@ -1384,7 +1383,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 +  size_t last_blank_pos;
 +  size_t last_blank_column;
 +  int is_blank_seen;
-+  int last_blank_increment;
++  int last_blank_increment = 0;
 +  int is_bs_following_last_blank;
 +  size_t bs_following_last_blank_num;
 +  int is_cr_after_last_blank;
@@ -1503,8 +1502,7 @@ diff -urNp coreutils-6.11-orig/src/join.
 +
 +      if (allocated_out < offset_out + mblength)
 +	{
-+	  allocated_out += 1024;
-+	  line_out = xrealloc (line_out, allocated_out);
++	  line_out = X2REALLOC (line_out, &allocated_out);
 +	}
 +
 +      memcpy (line_out + offset_out, bufpos, mblength);
@@ -1536,7 +1534,6 @@ diff -urNp coreutils-6.11-orig/src/join.
    if (offset_out)
      fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
  
-+  free(line_out);
 +}
 +#endif
 +


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- coreutils.spec	8 Sep 2009 14:34:31 -0000	1.272
+++ coreutils.spec	10 Sep 2009 10:36:58 -0000	1.273
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -333,6 +333,10 @@ fi
 %{_libdir}/coreutils
 
 %changelog
+* Thu Sep 10 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-6
+- fix double free error in fold for singlebyte locales
+  (caused by multibyte patch)
+
 * Tue Sep 08 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-5
 - fix sort -h for multibyte locales (reported via
   http://bugs.archlinux.org/task/16022)




More information about the fedora-extras-commits mailing list