Bash-4.2 patch 15
This commit is contained in:
parent
25db9a70d4
commit
cf391c36e2
2 changed files with 15 additions and 6 deletions
17
expr.c
17
expr.c
|
|
@ -476,19 +476,23 @@ expassign ()
|
|||
|
||||
if (special)
|
||||
{
|
||||
if ((op == DIV || op == MOD) && value == 0)
|
||||
{
|
||||
if (noeval == 0)
|
||||
evalerror (_("division by 0"));
|
||||
else
|
||||
value = 1;
|
||||
}
|
||||
|
||||
switch (op)
|
||||
{
|
||||
case MUL:
|
||||
lvalue *= value;
|
||||
break;
|
||||
case DIV:
|
||||
if (value == 0)
|
||||
evalerror (_("division by 0"));
|
||||
lvalue /= value;
|
||||
break;
|
||||
case MOD:
|
||||
if (value == 0)
|
||||
evalerror (_("division by 0"));
|
||||
lvalue %= value;
|
||||
break;
|
||||
case PLUS:
|
||||
|
|
@ -804,7 +808,12 @@ exp2 ()
|
|||
val2 = exppower ();
|
||||
|
||||
if (((op == DIV) || (op == MOD)) && (val2 == 0))
|
||||
{
|
||||
if (noeval == 0)
|
||||
evalerror (_("division by 0"));
|
||||
else
|
||||
val2 = 1;
|
||||
}
|
||||
|
||||
if (op == MUL)
|
||||
val1 *= val2;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@
|
|||
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
#define PATCHLEVEL 14
|
||||
#define PATCHLEVEL 15
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue