summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2009-11-16 17:03:28 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2009-11-16 17:03:28 (GMT)
commitd409a9b06588b300731c036cac349d30b8980bb5 (patch)
tree886d35a2b52ae7d8ce239df2f42a8f80c6585bac /generic
parent4e43d260f93216348337518eaead94855b2dadbf (diff)
downloadtcl-d409a9b06588b300731c036cac349d30b8980bb5.zip
tcl-d409a9b06588b300731c036cac349d30b8980bb5.tar.gz
tcl-d409a9b06588b300731c036cac349d30b8980bb5.tar.bz2
(Backport) Fix [Bug 2891556] and improve test to detect similar manifestations in the future.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclEncoding.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 99c71b0..843d772 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclEncoding.c,v 1.16.2.15 2008/07/04 19:21:19 jenglish Exp $
+ * RCS: @(#) $Id: tclEncoding.c,v 1.16.2.16 2009/11/16 17:03:29 ferrieux Exp $
*/
#include "tclInt.h"
@@ -575,6 +575,9 @@ FreeEncoding(encoding)
if (encodingPtr == NULL) {
return;
}
+ if (encodingPtr->refCount<=0) {
+ Tcl_Panic("FreeEncoding: refcount problem !!!");
+ }
encodingPtr->refCount--;
if (encodingPtr->refCount == 0) {
if (encodingPtr->freeProc != NULL) {
@@ -3003,11 +3006,24 @@ EscapeFreeProc(clientData)
if (dataPtr == NULL) {
return;
}
- subTablePtr = dataPtr->subTables;
- for (i = 0; i < dataPtr->numSubTables; i++) {
- FreeEncoding((Tcl_Encoding) subTablePtr->encodingPtr);
- subTablePtr++;
- }
+ /*
+ * The subTables should be freed recursively in normal operation but not
+ * during TclFinalizeEncodingSubsystem because they are also present as a
+ * weak reference in the toplevel encodingTable (ie they don't have a +1
+ * refcount for this), and unpredictable nuking order could remove them
+ * from under the following loop's feet [Bug 2891556].
+ *
+ * The encodingsInitialized flag, being reset on entry to TFES, can serve
+ * as a "not in finalization" test.
+ */
+ if (encodingsInitialized)
+ {
+ subTablePtr = dataPtr->subTables;
+ for (i = 0; i < dataPtr->numSubTables; i++) {
+ FreeEncoding((Tcl_Encoding) subTablePtr->encodingPtr);
+ subTablePtr++;
+ }
+ }
ckfree((char *) dataPtr);
}