ncurses 5.6 - patch 20080308

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

diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c
index 91a03711de7cc701928a46257a7aa4d63b21afd7..6b0905f07d67a8d1476eeb3cb850000d21922d5e 100644 (file)
--- a/ncurses/base/lib_redrawln.c
+++ b/ncurses/base/lib_redrawln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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            *
@@ -39,36 +39,45 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_redrawln.c,v 1.10 2001/09/29 17:41:31 tom Exp $")
+MODULE_ID("$Id: lib_redrawln.c,v 1.12 2007/10/13 20:08:56 tom Exp $")
 
 NCURSES_EXPORT(int)
 wredrawln(WINDOW *win, int beg, int num)
 {
     int i;
     int end;
-    size_t len = (win->_maxx + 1);
+    size_t len;
 
     T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
 
+    if (win == 0)
+       returnCode(ERR);
+
     if (beg < 0)
        beg = 0;
 
     if (touchline(win, beg, num) == ERR)
        returnCode(ERR);
 
+    if (touchline(curscr, beg + win->_begy, num) == ERR)
+       returnCode(ERR);
+
     end = beg + num;
     if (end > curscr->_maxy + 1)
        end = curscr->_maxy + 1;
     if (end > win->_maxy + 1)
        end = win->_maxy + 1;
 
+    len = (win->_maxx + 1);
     if (len > (size_t) (curscr->_maxx + 1))
        len = (size_t) (curscr->_maxx + 1);
     len *= sizeof(curscr->_line[0].text[0]);
 
     for (i = beg; i < end; i++) {
-       memset(curscr->_line[i + win->_begy].text + win->_begx, 0, len);
-       _nc_make_oldhash(i + win->_begy);
+       int crow = i + win->_begy;
+
+       memset(curscr->_line[crow].text + win->_begx, 0, len);
+       _nc_make_oldhash(crow);
     }
 
     returnCode(OK);