ncurses 6.1 - patch 20191019

[ncurses.git] / ncurses / widechar / lib_inwstr.c

diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c
index 76b1508beb459bea40a11693493b93157214a48c..3443ec6cbcac4f9281a02eec2bd1517533ecc9dc 100644 (file)
--- a/ncurses/widechar/lib_inwstr.c
+++ b/ncurses/widechar/lib_inwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2011,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_inwstr.c,v 1.7 2016/05/28 23:36:34 tom Exp $")
+MODULE_ID("$Id: lib_inwstr.c,v 1.8 2017/10/29 00:03:29 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnwstr(WINDOW *win, wchar_t *wstr, int n)
@@ -52,11 +52,12 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
        if (win) {
            int row, col;
            int last = 0;
+           bool done = FALSE;
 
            getyx(win, row, col);
 
            text = win->_line[row].text;
-           while (count < n && count != ERR) {
+           while (count < n && !done && count != ERR) {
 
                if (!isWidecExt(text[col])) {
                    int inx;
@@ -66,8 +67,11 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
                         && ((wch = text[col].chars[inx]) != 0);
                         ++inx) {
                        if (count + 1 > n) {
-                           if ((count = last) == 0) {
+                           done = TRUE;
+                           if (last == 0) {
                                count = ERR;    /* error if we store nothing */
+                           } else {
+                               count = last;   /* only store complete chars */
                            }
                            break;
                        }