Module Name: src
Committed By: jakllsch
Date: Fri Mar 1 23:14:13 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops32.c
Log Message:
Reset 'height' before underlining in rasops32_putchar_aa().
Prevents segfault when underlining whitespace in the upper left cell.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/rasops/rasops32.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/rasops/rasops32.c
diff -u src/sys/dev/rasops/rasops32.c:1.29 src/sys/dev/rasops/rasops32.c:1.30
--- src/sys/dev/rasops/rasops32.c:1.29 Sun Sep 15 09:39:47 2013
+++ src/sys/dev/rasops/rasops32.c Fri Mar 1 23:14:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops32.c,v 1.29 2013/09/15 09:39:47 martin Exp $ */
+/* $NetBSD: rasops32.c,v 1.30 2019/03/01 23:14:13 jakllsch Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.29 2013/09/15 09:39:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.30 2019/03/01 23:14:13 jakllsch Exp $");
#include "opt_rasops.h"
@@ -237,6 +237,7 @@ rasops32_putchar_aa(void *cookie, int ro
/* Do underline */
if ((attr & 1) != 0) {
rp = (uint32_t *)rrp;
+ height = font->fontheight;
DELTA(rp, (ri->ri_stride * (height - 2)), int32_t *);
while (width--)
*rp++ = clr[1];
