summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-07-15 17:53:57 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-07-15 17:53:57 (GMT)
commitc4e6823834ff315ac0cbc1dab5f3749482696aab (patch)
tree6886898b0e62f4bbbf4ba87fc0019845618be529
parentaa1a72b31337d3fa30a90286eac8374c296691be (diff)
parenta5cd0c254693b12d78c39cc4cddc07745e121668 (diff)
downloadtcl-c4e6823834ff315ac0cbc1dab5f3749482696aab.zip
tcl-c4e6823834ff315ac0cbc1dab5f3749482696aab.tar.gz
tcl-c4e6823834ff315ac0cbc1dab5f3749482696aab.tar.bz2
Avoid segfaults when RecordByteCodeStats() is called in a deleted interp.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCompile.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d87e5c..8e9dcff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclCompile.c: Avoid segfaults when RecordByteCodeStats()
+ is called in a deleted interp.
+
2011-07-08 Donal K. Fellows <dkf@users.sf.net>
* doc/http.n: [FRQ 3358415]: State what RFC defines HTTP/1.1.
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 7f11e0e..6d64feb 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -4093,6 +4093,11 @@ RecordByteCodeStats(
Interp *iPtr = (Interp *) *codePtr->interpHandle;
register ByteCodeStats *statsPtr = &(iPtr->stats);
+ if (iPtr == NULL) {
+ /* Avoid segfaulting in case we're called in a deleted interp */
+ return;
+ }
+
statsPtr->numCompilations++;
statsPtr->totalSrcBytes += (double) codePtr->numSrcBytes;
statsPtr->totalByteCodeBytes += (double) codePtr->structureSize;