summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2009-11-10 17:58:32 (GMT)
committerandreas_kupries <akupries@shaw.ca>2009-11-10 17:58:32 (GMT)
commitf3af5fd1b54cf4f38673bcb202297a67d48b28ef (patch)
tree7413041436474b523d6ee337c63b5cb43a8be867 /generic
parenta21451adb18ccaea3e9e1b573d8640f21b9ee4c2 (diff)
downloadtcl-f3af5fd1b54cf4f38673bcb202297a67d48b28ef.zip
tcl-f3af5fd1b54cf4f38673bcb202297a67d48b28ef.tar.gz
tcl-f3af5fd1b54cf4f38673bcb202297a67d48b28ef.tar.bz2
* generic/tclObj.c: Plus memory leak in TclContinuationsEnter().
[Bug 2895323]. Backport from Tcl 8.5 branch, change by Don Porter.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclObj.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 84d980e..4f51fac 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.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: tclObj.c,v 1.42.2.17 2009/08/25 20:59:11 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.42.2.18 2009/11/10 17:58:32 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -411,6 +411,17 @@ TclContinuationsEnter(objPtr,num,loc)
ContLineLoc* clLocPtr =
(ContLineLoc*) ckalloc (sizeof(ContLineLoc) + num*sizeof(int));
+ if (!newEntry) {
+ /*
+ * Somehow we're entering ContLineLoc data for the same value (objPtr)
+ * more than one time. Not sure whether that's expected, or a sign of
+ * trouble, but at a minimum, we should take care not to leak the old
+ * entry.
+ */
+
+ ckfree((char *) Tcl_GetHashValue(hPtr));
+ }
+
clLocPtr->num = num;
memcpy (&clLocPtr->loc, loc, num*sizeof(int));
clLocPtr->loc[num] = CLL_END; /* Sentinel */