rpms/bash/devel bash-multibyteifs.patch, 1.2, 1.3 bash.spec, 1.81, 1.82

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10833

Modified Files:
	bash-multibyteifs.patch bash.spec 
Log Message:
* Mon Aug  8 2005 Tim Waugh <twaugh at redhat.com> 3.0-33
- Fixed multibyte IFS handling for invalid input (bug #165243).


bash-multibyteifs.patch:
 subst.c |  157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 subst.h |    5 ++
 2 files changed, 156 insertions(+), 6 deletions(-)

Index: bash-multibyteifs.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-multibyteifs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-multibyteifs.patch	10 May 2005 16:09:13 -0000	1.2
+++ bash-multibyteifs.patch	8 Aug 2005 14:43:41 -0000	1.3
@@ -220,7 +220,7 @@
  
        /* Now skip sequences of space, tab, or newline characters if they are
  	 in the list of separators. */
-@@ -6796,7 +6921,21 @@
+@@ -6796,7 +6921,27 @@
        ifs_cmap[uc] = 1;
      }
  
@@ -234,7 +234,13 @@
 +    {
 +      size_t ifs_len = strnlen (ifs_value, MB_CUR_MAX);
 +      ifs_firstc_len = mblen (ifs_value, ifs_len);
-+      memcpy (ifs_firstc, ifs_value, ifs_firstc_len);
++      if (MB_INVALIDCH (ifs_firstc_len))
++        {
++          ifs_firstc[0] = '\0';
++          ifs_firstc_len = 1;
++        }
++      else
++        memcpy (ifs_firstc, ifs_value, ifs_firstc_len);
 +    }
 +#else
    ifs_firstc = ifs_value ? *ifs_value : 0;


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- bash.spec	8 Aug 2005 11:39:39 -0000	1.81
+++ bash.spec	8 Aug 2005 14:43:42 -0000	1.82
@@ -1,7 +1,7 @@
 Version: 3.0
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 32
+Release: 33
 Group: System Environment/Shells
 License: GPL
 Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
@@ -255,6 +255,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Mon Aug  8 2005 Tim Waugh <twaugh at redhat.com> 3.0-33
+- Fixed multibyte IFS handling for invalid input (bug #165243).
+
 * Mon Aug  8 2005 Tim Waugh <twaugh at redhat.com> 3.0-32
 - Fixed 'LC_ALL=C export LC_ALL' behaviour (bug #165249).