Thu Aug 9 14:38:16 2018 UTC ()
Pull up following revision(s) (requested by simonb in ticket #1627):

	lib/libcurses/addbytes.c: revision 1.48

Avoid curx going beyond end of window when adding a wide character to the
last column.

OK @blymn.


(martin)
diff -r1.42 -r1.42.4.1 src/lib/libcurses/addbytes.c

cvs diff -r1.42 -r1.42.4.1 src/lib/libcurses/addbytes.c (expand / switch to context diff)
--- src/lib/libcurses/addbytes.c 2013/11/10 03:14:16 1.42
+++ src/lib/libcurses/addbytes.c 2018/08/09 14:38:16 1.42.4.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: addbytes.c,v 1.42 2013/11/10 03:14:16 christos Exp $	*/
+/*	$NetBSD: addbytes.c,v 1.42.4.1 2018/08/09 14:38:16 martin Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: addbytes.c,v 1.42 2013/11/10 03:14:16 christos Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.42.4.1 2018/08/09 14:38:16 martin Exp $");
 #endif
 #endif				/* not lint */
 
@@ -572,7 +572,7 @@
 		if (newx > *(*lnp)->lastchp)
 			*(*lnp)->lastchp = newx;
 		__touchline(win, *y, sx, (int) win->maxx - 1);
-		win->curx = sx;
+		*x = win->curx = sx;
 	} else {
 		win->curx = *x;