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-015
287226
287226
Bug-Reported-by:	<dnade.ext@orange-ftgroup.com>
287226
Bug-Reference-ID:	<728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr>
287226
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html
287226
287226
Bug-Description:
287226
287226
When in a context where arithmetic evaluation is not taking place, the
287226
evaluator should not check for division by 0.
287226
287226
Patch (apply with `patch -p0'):
287226
287226
*** ../bash-4.2-patched/expr.c	2010-12-21 11:12:13.000000000 -0500
287226
--- expr.c	2011-08-02 20:58:28.000000000 -0400
287226
***************
287226
*** 477,480 ****
287226
--- 481,492 ----
287226
        if (special)
287226
  	{
287226
+ 	  if ((op == DIV || op == MOD) && value == 0)
287226
+ 	    {
287226
+ 	      if (noeval == 0)
287226
+ 		evalerror (_("division by 0"));
287226
+ 	      else
287226
+ 	        value = 1;
287226
+ 	    }
287226
+ 
287226
  	  switch (op)
287226
  	    {
287226
***************
287226
*** 483,493 ****
287226
  	      break;
287226
  	    case DIV:
287226
- 	      if (value == 0)
287226
- 		evalerror (_("division by 0"));
287226
  	      lvalue /= value;
287226
  	      break;
287226
  	    case MOD:
287226
- 	      if (value == 0)
287226
- 		evalerror (_("division by 0"));
287226
  	      lvalue %= value;
287226
  	      break;
287226
--- 495,501 ----
287226
***************
287226
*** 805,809 ****
287226
  
287226
        if (((op == DIV) || (op == MOD)) && (val2 == 0))
287226
! 	evalerror (_("division by 0"));
287226
  
287226
        if (op == MUL)
287226
--- 813,822 ----
287226
  
287226
        if (((op == DIV) || (op == MOD)) && (val2 == 0))
287226
! 	{
287226
! 	  if (noeval == 0)
287226
! 	    evalerror (_("division by 0"));
287226
! 	  else
287226
! 	    val2 = 1;
287226
! 	}
287226
  
287226
        if (op == MUL)
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 14
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 15
287226
  
287226
  #endif /* _PATCHLEVEL_H_ */