X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Ftinfo_driver.c;fp=ncurses%2Ftinfo%2Ftinfo_driver.c;h=8b986aa23ae2fff5296ea6fd24dfd29ae23af4b9;hp=8d471d184e6ba0d6def6c877965772c001ba5613;hb=3e7e5f8b5c4e8e499f682a1c414c576c16d47532;hpb=af3d0ee323cbb22d2a7596d564bf68f7307f5076

diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index 8d471d18..8b986aa2 100644
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -51,7 +51,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.54 2017/06/17 22:22:03 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.56 2017/06/24 19:54:16 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -179,10 +179,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
     if (status != TGETENT_YES) {
 	NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx termp);
 	if (status == TGETENT_ERR) {
-	    _nc_free_termtype2(&TerminalType(termp));
 	    ret_error0(status, "terminals database is inaccessible\n");
 	} else if (status == TGETENT_NO) {
-	    _nc_free_termtype2(&TerminalType(termp));
 	    ret_error1(status, "unknown terminal type.\n", tname);
 	}
     }
@@ -216,14 +214,17 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
 	     || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
 	    && VALID_STRING(clear_screen)) {
 	    _nc_free_termtype2(&TerminalType(termp));
+	    free(TCB);
 	    ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
 	} else {
 	    _nc_free_termtype2(&TerminalType(termp));
+	    free(TCB);
 	    ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
 	}
     }
     if (hard_copy) {
 	_nc_free_termtype2(&TerminalType(termp));
+	free(TCB);
 	ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
     }