ncurses 6.2 - patch 20210522

[ncurses.git] / ncurses / base / lib_addstr.c

diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index a1a55cb8bfd8b9bfa88ec7e11202beedfeb802b0..a1e8829dd7f5e255cf8e2d05dfe178e0248b4ae7 100644 (file)
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-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            *
@@ -44,7 +45,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.57 2020/12/05 20:06:19 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -59,10 +60,10 @@ waddnstr(WINDOW *win, const char *astr, int n)
           ("... current %s", _traceattr(WINDOW_ATTRS(win))));
        code = OK;
        if (n < 0)
-           n = (int) strlen(astr);
+           n = INT_MAX;
 
        TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));
-       while ((n-- > 0) && (*str != '\0')) {
+       while ((*str != '\0') && (n-- > 0)) {
            NCURSES_CH_T ch;
            TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str)));
            SetChar(ch, UChar(*str++), A_NORMAL);
@@ -87,7 +88,7 @@ waddchnstr(WINDOW *win, const chtype *astr, int n)
 
     T((T_CALLED("waddchnstr(%p,%p,%d)"), (void *) win, (const void *) astr, n));
 
-    if (!win)
+    if (!win || !astr)
        returnCode(ERR);
 
     y = win->_cury;
@@ -183,7 +184,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
        if (isWidecExt(astr[i]))
            continue;
 
-       len = wcwidth(CharOf(astr[i]));
+       len = _nc_wacs_width(CharOf(astr[i]));
 
        if (x + len - 1 <= win->_maxx) {
            line->text[x] = _nc_render(win, astr[i]);
@@ -194,6 +195,8 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
                    }
                    SetWidecExt(line->text[x + j], j);
                }
+           } else {
+               len = 1;
            }
            x = (NCURSES_SIZE_T) (x + len);
            end += len - 1;
@@ -229,10 +232,10 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
           ("... current %s", _traceattr(WINDOW_ATTRS(win))));
        code = OK;
        if (n < 0)
-           n = (int) wcslen(str);
+           n = INT_MAX;
 
        TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));
-       while ((n-- > 0) && (*str != L('\0'))) {
+       while ((*str != L('\0')) && (n-- > 0)) {
            NCURSES_CH_T ch;
            TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str));
            SetChar(ch, *str++, A_NORMAL);