Module Name: src
Committed By: rin
Date: Sat Jan 20 23:27:06 UTC 2018
Modified Files:
src/sys/dev/wscons: wsemul_vt100.c
Log Message:
Correct wrong assertion code introduced by rev 1.41:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/wscons/wsemul_vt100.c#rev1.41
Fix kernel panic reported in PR kern/52935.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/wscons/wsemul_vt100.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.41 src/sys/dev/wscons/wsemul_vt100.c:1.42
--- src/sys/dev/wscons/wsemul_vt100.c:1.41 Fri Nov 3 19:20:27 2017
+++ src/sys/dev/wscons/wsemul_vt100.c Sat Jan 20 23:27:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.41 2017/11/03 19:20:27 maya Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.42 2018/01/20 23:27:06 rin Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.41 2017/11/03 19:20:27 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.42 2018/01/20 23:27:06 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsmsgattrs.h"
@@ -1006,7 +1006,7 @@ wsemul_vt100_output(void *cookie, const
wsemul_vt100_output_normal(edp, *data, kernel);
continue;
}
- KASSERT(edp->state < __arraycount(vt100_output) - 1);
+ KASSERT(edp->state <= __arraycount(vt100_output));
edp->state = vt100_output[edp->state - 1](edp, *data);
}
if (vd->flags & VTFL_CURSORON)
