1 files changed, 7 insertions, 4 deletions

diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 8450deb74c9c7..9e4867b8b7e42 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -1032,6 +1032,7 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
 	int ymax;
 	u_short m;
 	int i, j, k;
+	uint8_t m1;
 
 	line_width = scp->sc->adp->va_line_width;
 	xoff = (x - scp->xoff*8)%8;
@@ -1046,9 +1047,10 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
 	for (i = y, j = 0; i < ymax; ++i, ++j) {
 		m = ~((mouse_and_mask[j] & ~mouse_or_mask[j]) >> xoff);
 		for (k = 0; k < 2; ++k) {
-			if (x + 8 * k < scp->xpixel) {
+			m1 = m >> (8 * (1 - k));
+			if (m1 != 0xff && x + 8 * k < scp->xpixel) {
 				readb(p + k);
-				writeb(p + k, m >> (8 * (1 - k)));
+				writeb(p + k, m1);
  			}
 		}
 		p += line_width;
@@ -1058,9 +1060,10 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y)
 	for (i = y, j = 0; i < ymax; ++i, ++j) {
 		m = mouse_or_mask[j] >> xoff;
 		for (k = 0; k < 2; ++k) {
-			if (x + 8 * k < scp->xpixel) {
+			m1 = m >> (8 * (1 - k));
+			if (m1 != 0 && x + 8 * k < scp->xpixel) {
 				readb(p + k);
-				writeb(p + k, m >> (8 * (1 - k)));
+				writeb(p + k, m1);
 			}
 		}
 		p += line_width;