From 41bd31e656e776866ce3f6d64923913b3cf4a712 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Sat, 14 Apr 2018 04:35:10 +0000
Subject: [PATCH] expr(1): Fix overflow detection when operand is INTMAX_MIN

PR:		227329
Submitted by:	Tobias Stoeckmann <tobias AT stoeckmann.org>
---
 bin/expr/expr.y | 6 ++----
 1 file 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 *