ncurses 5.9 - patch 20140201

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index e6d1a739c94f47023e8966678f654fe2d7689214..f708ecc51e4acebc22475eafa53f745fdcf3de9c 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_instr.c,v 1.17 2009/10/24 22:55:45 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.21 2014/02/01 22:09:27 tom Exp $")

 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)


@@ -64,7 +64,7 @@ winnstr(WINDOW *win, char *str, int n)
            cchar_t *cell = &(win->_line[row].text[col]);
            wchar_t *wch;
            attr_t attrs;
            cchar_t *cell = &(win->_line[row].text[col]);
            wchar_t *wch;
            attr_t attrs;

-           short pair;
+           NCURSES_PAIRS_T pair;

            int n2;
            bool done = FALSE;
            mbstate_t state;
            int n2;
            bool done = FALSE;
            mbstate_t state;


@@ -78,11 +78,15 @@ winnstr(WINDOW *win, char *str, int n)
                    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
 
                        init_mb(state);
                    if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
 
                        init_mb(state);

-                       n3 = wcstombs(0, wch, 0);
+                       n3 = wcstombs(0, wch, (size_t) 0);

                        if (!isEILSEQ(n3) && (n3 != 0)) {
                        if (!isEILSEQ(n3) && (n3 != 0)) {

-                           if (((int) n3 + i) > n) {
+                           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;
                                done = TRUE;

-                           } else if ((tmp = typeCalloc(char, n3 + 10)) == 0) {
+                           } else if ((tmp = typeCalloc(char, need)) == 0) {

                                done = TRUE;
                            } else {
                                init_mb(state);
                                done = TRUE;
                            } else {
                                init_mb(state);