X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_freeall.c;h=dbf0483f24016d8f4532077f8f1396d18449a2f5;hp=c4c90300c5f543647a7093c19646eaa91da1c008;hb=88d50b5d7057d4f59c586c93ff290d0a39528f70;hpb=3ec8f79f3ceda990461c80de2f96d66b886e00d5;ds=sidebyside

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index c4c90300..dbf0483f 100644
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey                    1996,1997                   *
+ *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
 
 #include <curses.priv.h>
@@ -40,7 +40,7 @@
 extern int malloc_errfd;	/* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.43 2007/05/05 20:56:17 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.45 2007/12/22 23:29:37 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
@@ -61,7 +61,11 @@ _nc_freeall(void)
     }
 #endif
     if (SP != 0) {
+	_nc_lock_global(windowlist);
+
 	while (_nc_windows != 0) {
+	    bool deleted = FALSE;
+
 	    /* Delete only windows that're not a parent */
 	    for (p = _nc_windows; p != 0; p = p->next) {
 		bool found = FALSE;
@@ -76,14 +80,23 @@ _nc_freeall(void)
 		}
 
 		if (!found) {
-		    delwin(&(p->win));
+		    if (delwin(&(p->win)) != ERR)
+			deleted = TRUE;
 		    break;
 		}
 	    }
+
+	    /*
+	     * Don't continue to loop if the list is trashed.
+	     */
+	    if (!deleted)
+		break;
 	}
 	delscreen(SP);
+	_nc_unlock_global(windowlist);
     }
-    del_curterm(cur_term);
+    if (cur_term != 0)
+	del_curterm(cur_term);
 
 #if USE_WIDEC_SUPPORT
     FreeIfNeeded(_nc_wacs);