[src/netbsd-7]: src/lib/libcurses Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9539d64ad16a
branches:  netbsd-7
changeset: 800518:9539d64ad16a
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 09 14:38:16 2018 +0000

description:
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.

diffstat:

 lib/libcurses/addbytes.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 0c158c1e5649 -r 9539d64ad16a lib/libcurses/addbytes.c
--- a/lib/libcurses/addbytes.c  Wed Aug 08 10:18:41 2018 +0000
+++ b/lib/libcurses/addbytes.c  Thu Aug 09 14:38:16 2018 +0000
@@ -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;