summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2006-03-09 23:13:25 (GMT)
committerdgp <dgp@users.sourceforge.net>2006-03-09 23:13:25 (GMT)
commit781917eceebd25c1e52cb8b8b5d6a56a30016b50 (patch)
treef838fd1752434ad457404ca9dfdd901999f7af97
parentaf0f32e244b163b65ce01a539f464af809438939 (diff)
downloadtcl-781917eceebd25c1e52cb8b8b5d6a56a30016b50.zip
tcl-781917eceebd25c1e52cb8b8b5d6a56a30016b50.tar.gz
tcl-781917eceebd25c1e52cb8b8b5d6a56a30016b50.tar.bz2
Undo latest commit due to controversy about whether some use case
might exist for a Tcl_Panic that returns.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclPanic.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 555e9a2..db0af69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2006-02-09 Miguel Sofer <msofer@users.sf.net>
-
- * generic/tclPanic.c (Tcl_PanicVA): added an unconditional abort
- at the end, to insure that a panic cannot return even if the
- actual procedure was overriden by a Tcl_SetPanicProc() call. Bug
- caught by looking at Coverity's analysis.
-
2006-03-09 Vince Darley <vincentdarley@sourceforge.net>
* win/tclWinFile.c: fix to 'file writable' in certain XP
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index fb0d69b..e47f9b6 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPanic.c,v 1.9 2006/03/09 22:00:59 msofer Exp $
+ * RCS: @(#) $Id: tclPanic.c,v 1.10 2006/03/09 23:13:25 dgp Exp $
*/
#include "tclInt.h"
@@ -100,8 +100,8 @@ Tcl_PanicVA(
arg7, arg8);
(void) fprintf(stderr, "\n");
(void) fflush(stderr);
+ abort();
}
- abort();
}
/*