ncurses 6.0 - patch 20160625

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index d75dee9e40efa9ef7f40ec6dbe1bab20d3e2abbe..af26de482bef5db1ef703f10be20a8ba2c376f52 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2016 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,19 +41,21 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.14 2005/04/16 17:51:12 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.22 2016/05/28 23:11:26 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
 {
-    int i = 0, row, col;
+    int i = 0;
 
-    T((T_CALLED("winnstr(%p,%p,%d)"), win, str, 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 (n < 0)
@@ -62,35 +64,43 @@ winnstr(WINDOW *win, char *str, int n)
        for (; i < n;) {
 #if USE_WIDEC_SUPPORT
            cchar_t *cell = &(win->_line[row].text[col]);
-           wchar_t *wch;
            attr_t attrs;
-           short pair;
-           int n2;
-           bool done = FALSE;
+           NCURSES_PAIRS_T pair;
            mbstate_t state;
-           size_t i3, n3;
            char *tmp;
 
            if (!isWidecExt(*cell)) {
+               wchar_t *wch;
+               int n2;
+
                n2 = getcchar(cell, 0, 0, 0, 0);
                if (n2 > 0
                    && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != 0) {
+                   bool done = FALSE;
+
                    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
+                       size_t n3;
 
                        init_mb(state);
-                       n3 = wcstombs(0, wch, 0);
-                       if (isEILSEQ(n3) || (n3 == 0)) {
-                           ;
-                       } else if ((int) (n3 + i) >= n) {
-                           done = TRUE;
-                       } else if ((tmp = typeCalloc(char, n3 + 10)) == 0) {
-                           done = TRUE;
-                       } else {
-                           init_mb(state);
-                           wcstombs(tmp, wch, n3);
-                           for (i3 = 0; i3 < n3; ++i3)
-                               str[i++] = tmp[i3];
-                           free(tmp);
+                       n3 = wcstombs(0, wch, (size_t) 0);
+                       if (!isEILSEQ(n3) && (n3 != 0)) {
+                           size_t need = n3 + 10 + (size_t) i;
+                           int have = (int) n3 + i;
+
+                           /* check for loop-done as well as overflow */
+                           if (have > n || (int) need <= 0) {
+                               done = TRUE;
+                           } else if ((tmp = typeCalloc(char, need)) == 0) {
+                               done = TRUE;
+                           } else {
+                               size_t i3;
+
+                               init_mb(state);
+                               wcstombs(tmp, wch, n3);
+                               for (i3 = 0; i3 < n3; ++i3)
+                                   str[i++] = tmp[i3];
+                               free(tmp);
+                           }
                        }
                    }
                    free(wch);
@@ -99,12 +109,10 @@ winnstr(WINDOW *win, char *str, int n)
                }
            }
 #else
-           str[i++] = CharOf(win->_line[row].text[col]);
+           str[i++] = (char) CharOf(win->_line[row].text[col]);
 #endif
            if (++col > win->_maxx) {
-               col = 0;
-               if (++row > win->_maxy)
-                   break;
+               break;
            }
        }
     }