Module Name: src
Committed By: rin
Date: Tue Jul 30 14:33:05 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops.c
Log Message:
Fix catastrophe when ri_emustride != ri_stride in rasops_copyrows().
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/rasops/rasops.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/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.98 src/sys/dev/rasops/rasops.c:1.99
--- src/sys/dev/rasops/rasops.c:1.98 Tue Jul 30 12:20:24 2019
+++ src/sys/dev/rasops/rasops.c Tue Jul 30 14:33:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.98 2019/07/30 12:20:24 rin Exp $ */
+/* $NetBSD: rasops.c,v 1.99 2019/07/30 14:33:04 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.98 2019/07/30 12:20:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.99 2019/07/30 14:33:04 rin Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -671,7 +671,7 @@ rasops_copyrows(void *cookie, int src, i
{
struct rasops_info *ri = (struct rasops_info *)cookie;
uint8_t *sp, *dp, *hp;
- int n;
+ int n, stride;
hp = NULL; /* XXX GCC */
@@ -701,6 +701,7 @@ rasops_copyrows(void *cookie, int src, i
num *= ri->ri_font->fontheight;
n = ri->ri_emustride;
+ stride = ri->ri_stride;
sp = ri->ri_bits + src * ri->ri_yscale;
dp = ri->ri_bits + dst * ri->ri_yscale;
@@ -709,12 +710,12 @@ rasops_copyrows(void *cookie, int src, i
while (num--) {
memmove(dp, sp, n);
- dp += n;
+ dp += stride;
if (ri->ri_hwbits) {
memcpy(hp, sp, n);
- hp += n;
+ hp += stride;
}
- sp += n;
+ sp += stride;
}
}
