rcolebaugh / rpms / bash

Forked from rpms/bash a year ago
Clone
287226
			     BASH PATCH REPORT
287226
			     =================
287226
287226
Bash-Release:	4.2
287226
Patch-ID:	bash42-028
287226
287226
Bug-Reported-by:	Mark Edgar <medgar123@gmail.com>
287226
Bug-Reference-ID:	<CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com>
287226
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html
287226
287226
Bug-Description:
287226
287226
When using a word expansion for which the right hand side is evaluated,
287226
certain expansions of quoted null strings include spurious ^? characters.
287226
287226
Patch (apply with `patch -p0'):
287226
287226
*** ../bash-4.2-patched/subst.c	2012-03-11 17:35:13.000000000 -0400
287226
--- subst.c	2012-03-20 19:30:13.000000000 -0400
287226
***************
287226
*** 5810,5813 ****
287226
--- 5810,5823 ----
287226
        if (qdollaratp && ((hasdol && quoted) || l->next))
287226
  	*qdollaratp = 1;
287226
+       /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is
287226
+ 	 a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the
287226
+ 	 flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the
287226
+ 	 expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
287226
+ 	 (which is more paranoia than anything else), we need to return the
287226
+ 	 quoted null string and set the flags to indicate it. */
287226
+       if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL))
287226
+ 	{
287226
+ 	  w->flags |= W_HASQUOTEDNULL;
287226
+ 	}
287226
        dispose_words (l);
287226
      }
287226
287226
*** ../bash-4.2-patched/patchlevel.h	Sat Jun 12 20:14:48 2010
287226
--- patchlevel.h	Thu Feb 24 21:41:34 2011
287226
***************
287226
*** 26,30 ****
287226
     looks for to find the patch level (for the sccs version string). */
287226
  
287226
! #define PATCHLEVEL 27
287226
  
287226
  #endif /* _PATCHLEVEL_H_ */
287226
--- 26,30 ----
287226
     looks for to find the patch level (for the sccs version string). */
287226
  
287226
! #define PATCHLEVEL 28
287226
  
287226
  #endif /* _PATCHLEVEL_H_ */