aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/expr/expr.y6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 0ddf3990d2a8..4f07275031a3 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -422,11 +422,9 @@ op_plus(struct val *a, struct val *b)
void
assert_minus(intmax_t a, intmax_t b, intmax_t r)
{
- /* special case subtraction of INTMAX_MIN */
- if (b == INTMAX_MIN && a < 0)
+ if ((a >= 0 && b < 0 && r <= 0) ||
+ (a < 0 && b > 0 && r >= 0))
errx(ERR_EXIT, "overflow");
- /* check addition of negative subtrahend */
- assert_plus(a, -b, r);
}
struct val *