X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fwidechar%2Flib_ins_wch.c;h=f75361081b62e7a1ad45173aa1685c1d5b141733;hb=265e45e43e9917e8b9ecc2bf9d23867a3ede2ecd;hp=12dc19c2a7eebbe0666531e47222052da384e614;hpb=88e7914acafc37f84af25b80f403eb4290e423d4;p=ncurses.git

diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index 12dc19c2..f7536108 100644
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002-2017,2019 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 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 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.23 2019/05/04 20:46:24 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.25 2020/12/05 20:04:59 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -110,7 +111,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
     if (win != 0
 	&& wstr != 0) {
 	if (n < 1)
-	    n = (int) wcslen(wstr);
+	    n = INT_MAX;
 	code = OK;
 
 	if (n > 0) {
@@ -119,7 +120,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
 	    NCURSES_SIZE_T oy = win->_cury;
 	    NCURSES_SIZE_T ox = win->_curx;
 
-	    for (cp = wstr; ((cp - wstr) < n) && *cp; cp++) {
+	    for (cp = wstr; (*cp != L'\0') && ((cp - wstr) < n); cp++) {
 		int len = _nc_wacs_width(*cp);
 
 		if ((len >= 0 && len != 1) || !is7bits(*cp)) {