ncurses 4.2

[ncurses.git] / ncurses / lib_touch.c

diff --git a/ncurses/lib_touch.c b/ncurses/lib_touch.c
index 82ef92c5c437098aa725d788439333acad5f93d6..f39338d0d5287e9c67e2b478017e3a7f8be17852 100644 (file)
--- a/ncurses/lib_touch.c
+++ b/ncurses/lib_touch.c
@@ -1,23 +1,35 @@
+/****************************************************************************
+ * Copyright (c) 1998 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 
-/***************************************************************************
-*                            COPYRIGHT NOTICE                              *
-****************************************************************************
-*                ncurses is copyright (C) 1992-1995                        *
-*                          Zeyd M. Ben-Halim                               *
-*                          zmbenhal@netcom.com                             *
-*                          Eric S. Raymond                                 *
-*                          esr@snark.thyrsus.com                           *
-*                                                                          *
-*        Permission is hereby granted to reproduce and distribute ncurses  *
-*        by any means and for any fee, whether alone or as part of a       *
-*        larger distribution, in source or in binary form, PROVIDED        *
-*        this notice is included with any such distribution, and is not    *
-*        removed from any of its header files. Mention of ncurses in any   *
-*        applications linked with it is highly appreciated.                *
-*                                                                          *
-*        ncurses comes AS IS with no warranty, implied or expressed.       *
-*                                                                          *
-***************************************************************************/
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
 
 /*
 **     lib_touch.c
@@ -31,14 +43,14 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_touch.c,v 1.3 1997/02/02 00:26:15 tom Exp $")
+MODULE_ID("$Id: lib_touch.c,v 1.5 1998/02/11 12:13:54 tom Exp $")
 
 int is_linetouched(WINDOW *win, int line)
 {
        T((T_CALLED("is_linetouched(%p,%d)"), win, line));
 
        /* XSI doesn't define any error */
-       if (line > win->_maxy || line < 0)
+       if (!win || (line > win->_maxy) || (line < 0))
                returnCode(ERR);
 
        returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
@@ -50,9 +62,10 @@ int i;
 
        T((T_CALLED("is_wintouched(%p)"), win));
 
-       for (i = 0; i <= win->_maxy; i++)
-               if (win->_line[i].firstchar != _NOCHANGE)
-                       returnCode(TRUE);
+       if (win)
+               for (i = 0; i <= win->_maxy; i++)
+                       if (win->_line[i].firstchar != _NOCHANGE)
+                               returnCode(TRUE);
        returnCode(FALSE);
 }
 
@@ -62,7 +75,11 @@ int i;
 
        T((T_CALLED("wtouchln(%p,%d,%d,%d)"), win, y, n, changed));
 
+       if (!win || (n<0) || (y<0) || (y>win->_maxy))
+         returnCode(ERR);
+
        for (i = y; i < y+n; i++) {
+               if (i>win->_maxy) break;
                win->_line[i].firstchar = changed ? 0 : _NOCHANGE;
                win->_line[i].lastchar = changed ? win->_maxx : _NOCHANGE;
        }