Module Name: src
Committed By: rin
Date: Fri Aug 2 04:18:15 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops.c
Log Message:
Oops, for rasops_copycols(), we cannot use memmove even if src == dst.
On the other hand, memmove is safe for rasops_copyrows().
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 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.105 src/sys/dev/rasops/rasops.c:1.106
--- src/sys/dev/rasops/rasops.c:1.105 Wed Jul 31 04:45:44 2019
+++ src/sys/dev/rasops/rasops.c Fri Aug 2 04:18:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.105 2019/07/31 04:45:44 rin Exp $ */
+/* $NetBSD: rasops.c,v 1.106 2019/08/02 04:18:15 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.105 2019/07/31 04:45:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.106 2019/08/02 04:18:15 rin Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -779,12 +779,12 @@ rasops_copycols(void *cookie, int row, i
hp = ri->ri_hwbits + row + dst * ri->ri_xscale;
while (height--) {
- memcpy(dp, sp, num);
- dp += ri->ri_stride;
+ memmove(dp, sp, num);
if (ri->ri_hwbits) {
- memcpy(hp, sp, num);
+ memcpy(hp, dp, num);
hp += ri->ri_stride;
}
+ dp += ri->ri_stride;
sp += ri->ri_stride;
}
}
