Module Name: src
Committed By: rillig
Date: Tue Apr 19 23:16:14 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: expr_fold.c expr_fold.exp
src/usr.bin/xlint/lint1: tree.c
Log Message:
lint: fix integer overflow on seeing -(uint64_t)INT64_MIN
Seen in external/cddl/osnet/dist/lib/libuutil/common/uu_strtoint.c,
which is protected by a NOLINT in ../Makefile.inc.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/expr_fold.c \
src/tests/usr.bin/xlint/lint1/expr_fold.exp
cvs rdiff -u -r1.435 -r1.436 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/expr_fold.c
diff -u src/tests/usr.bin/xlint/lint1/expr_fold.c:1.6 src/tests/usr.bin/xlint/lint1/expr_fold.c:1.7
--- src/tests/usr.bin/xlint/lint1/expr_fold.c:1.6 Fri Apr 15 21:50:07 2022
+++ src/tests/usr.bin/xlint/lint1/expr_fold.c Tue Apr 19 23:16:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: expr_fold.c,v 1.6 2022/04/15 21:50:07 rillig Exp $ */
+/* $NetBSD: expr_fold.c,v 1.7 2022/04/19 23:16:14 rillig Exp $ */
# 3 "expr_fold.c"
/*
@@ -287,3 +287,16 @@ struct ctassert5_struct {
? 1
: -1;
};
+
+/*
+ * Since Makefile.inc 1.21 from 2022-04-08 (which added -ftrapv) and before
+ * tree.c 1.436 from 2022-04-20, lint crashed with an integer overflow when
+ * calculating '-(uint64_t)INT64_MIN' in val_t.v_quad.
+ */
+void
+unary_minus_overflow(unsigned long long val)
+{
+ /* expect+1: warning: integer overflow detected, op '-' [141] */
+ if (val > -(unsigned long long)(-0x7fffffffffffffffL - 1))
+ return;
+}
Index: src/tests/usr.bin/xlint/lint1/expr_fold.exp
diff -u src/tests/usr.bin/xlint/lint1/expr_fold.exp:1.6 src/tests/usr.bin/xlint/lint1/expr_fold.exp:1.7
--- src/tests/usr.bin/xlint/lint1/expr_fold.exp:1.6 Fri Apr 15 21:50:07 2022
+++ src/tests/usr.bin/xlint/lint1/expr_fold.exp Tue Apr 19 23:16:14 2022
@@ -32,3 +32,4 @@ expr_fold.c(183): warning: integer overf
expr_fold.c(186): warning: integer overflow detected, op '<<' [141]
expr_fold.c(190): warning: shift amount 104 is greater than bit-size 32 of 'unsigned int' [122]
expr_fold.c(202): warning: shift amount 104 is greater than bit-size 32 of 'int' [122]
+expr_fold.c(300): warning: integer overflow detected, op '-' [141]
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.435 src/usr.bin/xlint/lint1/tree.c:1.436
--- src/usr.bin/xlint/lint1/tree.c:1.435 Tue Apr 19 22:14:30 2022
+++ src/usr.bin/xlint/lint1/tree.c Tue Apr 19 23:16:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.435 2022/04/19 22:14:30 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.436 2022/04/19 23:16:14 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.435 2022/04/19 22:14:30 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.436 2022/04/19 23:16:14 rillig Exp $");
#endif
#include <float.h>
@@ -3210,7 +3210,7 @@ fold(tnode_t *tn)
q = sl;
break;
case UMINUS:
- q = -sl;
+ q = sl == INT64_MIN ? sl : -sl;
if (sl != 0 && msb(q, t) == msb(sl, t))
ovfl = true;
break;
