Module Name: src
Committed By: rillig
Date: Sat Jun 19 16:05:07 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_249.c msg_249.exp
src/usr.bin/xlint/lint1: func.c
Log Message:
lint: fix assertion failure after malformed statement
Found using afl.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_249.c \
src/tests/usr.bin/xlint/lint1/msg_249.exp
cvs rdiff -u -r1.109 -r1.110 src/usr.bin/xlint/lint1/func.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/msg_249.c
diff -u src/tests/usr.bin/xlint/lint1/msg_249.c:1.2 src/tests/usr.bin/xlint/lint1/msg_249.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_249.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.c Sat Jun 19 16:05:07 2021
@@ -1,7 +1,16 @@
-/* $NetBSD: msg_249.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: msg_249.c,v 1.3 2021/06/19 16:05:07 rillig Exp $ */
# 3 "msg_249.c"
// Test for message: syntax error '%s' [249]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/*
+ * Before func.c 1.110 from 2021-06-19, lint ran into this:
+ * assertion "cstmt->c_kind == kind" failed in end_control_statement
+ */
+void
+function(void)
+{
+ if (0)
+ ;
+ ); /* expect: syntax error ')' */
+}
Index: src/tests/usr.bin/xlint/lint1/msg_249.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_249.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_249.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_249.exp:1.2 Sun Mar 21 20:45:00 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.exp Sat Jun 19 16:05:07 2021
@@ -1 +1 @@
-msg_249.c(6): error: syntax error ':' [249]
+msg_249.c(15): error: syntax error ')' [249]
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.109 src/usr.bin/xlint/lint1/func.c:1.110
--- src/usr.bin/xlint/lint1/func.c:1.109 Sat Jun 19 15:51:11 2021
+++ src/usr.bin/xlint/lint1/func.c Sat Jun 19 16:05:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.109 2021/06/19 15:51:11 rillig Exp $ */
+/* $NetBSD: func.c,v 1.110 2021/06/19 16:05:07 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.109 2021/06/19 15:51:11 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.110 2021/06/19 16:05:07 rillig Exp $");
#endif
#include <stdlib.h>
@@ -173,7 +173,9 @@ end_control_statement(control_statement_
case_label_t *cl, *next;
lint_assert(cstmt != NULL);
- lint_assert(cstmt->c_kind == kind);
+
+ while (cstmt->c_kind != kind)
+ cstmt = cstmt->c_surrounding;
ci = cstmt;
cstmt = ci->c_surrounding;
