summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-04-07 01:11:50 (GMT)
committerhobbs <hobbs>2006-04-07 01:11:50 (GMT)
commitff1aeed46091825a1a52b5f03a39cecde7fbcac9 (patch)
treeb0ae85d6f30df92c6db7100033ca3cafc3e38716
parent66eb0f67f7cc2d152c918f5ccfe94cd89a7581fe (diff)
downloadtcl-ff1aeed46091825a1a52b5f03a39cecde7fbcac9.zip
tcl-ff1aeed46091825a1a52b5f03a39cecde7fbcac9.tar.gz
tcl-ff1aeed46091825a1a52b5f03a39cecde7fbcac9.tar.bz2
* generic/tclRegexp.c (FinalizeRegexp): full reset data to
indicate that readiness for reinitialization.
-rw-r--r--ChangeLog15
-rw-r--r--generic/tclRegexp.c8
2 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d2dcd34..2d4c114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2006-04-06 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tclRegexp.c (FinalizeRegexp): full reset data to
+ indicate that readiness for reinitialization.
+
2006-04-06 Don Porter <dgp@users.sourceforge.net>
- * generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct): It seems
- * tests/indexObj.test: there are extensions that rely on the prior
- * doc/GetIndex.3: behavior that the empty string cannot succeed
- as a unique prefix matcher, so I'm restoring Donal Fellow's solution.
- Added mention of this detail to the documentation. [Bug 1464039]
+ * generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct): It seems
+ * tests/indexObj.test: there are extensions that rely on the prior
+ * doc/GetIndex.3: behavior that the empty string cannot succeed
+ as a unique prefix matcher, so I'm restoring Donal Fellow's solution.
+ Added mention of this detail to the documentation. [Bug 1464039]
* tests/compExpr-old.test: Updated testmathfunctions constraint
* tests/compExpr.test: to post-TIP-232 world.
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index b5e3bec..a9ddf03 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclRegexp.c,v 1.21 2005/11/02 00:55:06 dkf Exp $
+ * RCS: @(#) $Id: tclRegexp.c,v 1.22 2006/04/07 01:12:11 hobbs Exp $
*/
#include "tclInt.h"
@@ -1014,7 +1014,13 @@ FinalizeRegexp(
FreeRegexp(regexpPtr);
}
ckfree(tsdPtr->patterns[i]);
+ tsdPtr->patterns[i] = NULL;
}
+ /*
+ * We may find ourselves reinitialized if another finalization routine
+ * invokes regexps.
+ */
+ tsdPtr->initialized = 0;
}
/*