rpms/coreutils/devel coreutils-i18n.patch, 1.33, 1.34 coreutils.spec, 1.258, 1.259

[Ondrej Vasik]

Author: ovasik

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

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Log Message:
fix segfaults in join (i18n patch) when using multibyte locales(#497368)

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- coreutils-i18n.patch	1 Apr 2009 11:14:30 -0000	1.33
+++ coreutils-i18n.patch	23 Apr 2009 17:01:01 -0000	1.34
@@ -433,7 +433,7 @@
 +
 +  memset (&state, 0, sizeof (mbstate_t));
 +
-+  if (ptr == lim)
++  if (ptr >= lim)
 +    return;
 +
 +  if (tab != NULL)
@@ -464,7 +464,7 @@
 +		}
 +	    }
 +
-+	  if (sep == lim)
++	  if (sep >= lim)
 +	    break;
 +
 +	  extract_field (line, ptr, sep - ptr);
@@ -505,7 +505,7 @@
 +	  mblength = (mblength < 1) ? 1 : mblength;
 +
 +	  sep = ptr + mblength;
-+	  while (sep != lim)
++	  while (sep < lim)
 +	    {
 +	      state_bak = state;
 +	      mblength = mbrtowc (&wc, sep, lim - sep + 1, &state);
@@ -524,7 +524,7 @@
 +	    }
 +
 +	  extract_field (line, ptr, sep - ptr);
-+	  if (sep == lim)
++	  if (sep >= lim)
 +	    return;
 +
 +	  state_bak = state;
@@ -538,7 +538,7 @@
 +	  mblength = (mblength < 1) ? 1 : mblength;
 +
 +	  ptr = sep + mblength;
-+	  while (ptr != lim)
++	  while (ptr < lim)
 +	    {
 +	      state_bak = state;
 +	      mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state);
@@ -556,7 +556,7 @@
 +	      ptr += mblength;
 +	    }
 +	}
-+      while (ptr != lim);
++      while (ptr < lim);
 +    }
 +
 +  extract_field (line, ptr, lim - ptr);


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- coreutils.spec	17 Apr 2009 09:54:04 -0000	1.258
+++ coreutils.spec	23 Apr 2009 17:01:01 -0000	1.259
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -314,6 +314,10 @@
 /sbin/runuser
 
 %changelog
+* Thu Apr 23 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-3
+- fix segfaults in join (i18n patch) when using multibyte
+  locales(#497368)
+
 * Fri Apr 17 2009 Ondrej Vasik <ovasik at redhat.com> 7.2-2
 - make mv xattr support failures silent (as is done for
   cp -a) - #496142