ncurses 6.2 - patch 20200523

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

diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index 4e3a040cf032d94ea71d8b1422496ff5219bcee9..19ebfcd5b337fe4b90fb0cadf8174d8e657ce6d4 100644 (file)
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 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.48 2007/10/13 19:56:57 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.56 2020/02/02 23:34:34 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
@@ -52,7 +53,7 @@ waddnstr(WINDOW *win, const char *astr, int n)
     const char *str = astr;
     int code = ERR;
 
-    T((T_CALLED("waddnstr(%p,%s,%d)"), win, _nc_visbufn(astr, n), n));
+    T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
 
     if (win && (str != 0)) {
        TR(TRACE_VIRTPUT | TRACE_ATTRS,
@@ -85,9 +86,9 @@ waddchnstr(WINDOW *win, const chtype *astr, int n)
     int i;
     struct ldat *line;
 
-    T((T_CALLED("waddchnstr(%p,%p,%d)"), win, astr, n));
+    T((T_CALLED("waddchnstr(%p,%p,%d)"), (void *) win, (const void *) astr, n));
 
-    if (!win)
+    if (!win || !astr)
        returnCode(ERR);
 
     y = win->_cury;
@@ -107,7 +108,7 @@ waddchnstr(WINDOW *win, const chtype *astr, int n)
     for (i = 0; i < n && ChCharOf(astr[i]) != '\0'; ++i) {
        SetChar2(line->text[i + x], astr[i]);
     }
-    CHANGED_RANGE(line, x, x + n - 1);
+    CHANGED_RANGE(line, x, (NCURSES_SIZE_T) (x + n - 1));
 
     _nc_synchook(win);
     returnCode(code);
@@ -119,8 +120,10 @@ NCURSES_EXPORT(int)
 _nc_wchstrlen(const cchar_t *s)
 {
     int result = 0;
-    while (CharOf(s[result]) != L'\0') {
-       result++;
+    if (s != 0) {
+       while (CharOf(s[result]) != L'\0') {
+           result++;
+       }
     }
     return result;
 }
@@ -135,7 +138,10 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
     struct ldat *line;
     int i, j, start, len, end;
 
-    T((T_CALLED("wadd_wchnstr(%p,%s,%d)"), win, _nc_viscbuf(astr, n), n));
+    T((T_CALLED("wadd_wchnstr(%p,%s,%d)"),
+       (void *) win,
+       _nc_viscbuf(astr, n),
+       n));
 
     if (!win)
        returnCode(ERR);
@@ -178,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]);
@@ -189,8 +195,10 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
                    }
                    SetWidecExt(line->text[x + j], j);
                }
+           } else {
+               len = 1;
            }
-           x += len;
+           x = (NCURSES_SIZE_T) (x + len);
            end += len - 1;
        } else {
            break;
@@ -217,7 +225,7 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 {
     int code = ERR;
 
-    T((T_CALLED("waddnwstr(%p,%s,%d)"), win, _nc_viswbufn(str, n), n));
+    T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
 
     if (win && (str != 0)) {
        TR(TRACE_VIRTPUT | TRACE_ATTRS,