ncurses 6.4 - patch 20240420

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index af26de482bef5db1ef703f10be20a8ba2c376f52..221ebd290400ccf27d436a0561140af6e377ac23 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright 2020-2021,2023 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            *
@@ -41,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.22 2016/05/28 23:11:26 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.26 2023/06/03 12:37:04 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
@@ -50,23 +51,21 @@ winnstr(WINDOW *win, char *str, int n)
 
     T((T_CALLED("winnstr(%p,%p,%d)"), (void *) win, str, n));
 
-    if (!str)
-       returnCode(0);
-
-    if (win) {
-       int row, col;
-
-       getyx(win, row, col);
+    if (!win || !str) {
+       i = ERR;
+    } else {
+       int row = win->_cury;
+       int col = win->_curx;
+       NCURSES_CH_T *text = win->_line[row].text;
 
        if (n < 0)
-           n = win->_maxx - win->_curx + 1;
+           n = win->_maxx - col + 1;
 
        for (; i < n;) {
 #if USE_WIDEC_SUPPORT
-           cchar_t *cell = &(win->_line[row].text[col]);
+           cchar_t *cell = &(text[col]);
            attr_t attrs;
            NCURSES_PAIRS_T pair;
-           mbstate_t state;
            char *tmp;
 
            if (!isWidecExt(*cell)) {
@@ -79,11 +78,12 @@ winnstr(WINDOW *win, char *str, int n)
                    bool done = FALSE;
 
                    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
+                       mbstate_t state;
                        size_t n3;
 
                        init_mb(state);
                        n3 = wcstombs(0, wch, (size_t) 0);
-                       if (!isEILSEQ(n3) && (n3 != 0)) {
+                       if (!isEILSEQ(n3) && (n3 != 0) && (n3 <= MB_LEN_MAX)) {
                            size_t need = n3 + 10 + (size_t) i;
                            int have = (int) n3 + i;
 
@@ -109,14 +109,14 @@ winnstr(WINDOW *win, char *str, int n)
                }
            }
 #else
-           str[i++] = (char) CharOf(win->_line[row].text[col]);
+           str[i++] = (char) CharOf(text[col]);
 #endif
            if (++col > win->_maxx) {
                break;
            }
        }
+       str[i] = '\0';          /* SVr4 does not seem to count the null */
     }
-    str[i] = '\0';             /* SVr4 does not seem to count the null */
     T(("winnstr returns %s", _nc_visbuf(str)));
     returnCode(i);
 }