From da7f246c3bdbc8ce45d43a8fe08c5551f801988d Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 10 Nov 2009 16:46:16 +0000 Subject: * generic/tclObj.c: Plus memory leak in TclContinuationsEnter(). [Bug 2895323] --- ChangeLog | 5 +++++ generic/tclObj.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 019b230..3c22fda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-11-10 Don Porter + + * generic/tclObj.c: Plus memory leak in TclContinuationsEnter(). + [Bug 2895323] + 2009-11-09 Stuart Cassoff * win/README: [bug 2459744]: Removed outdated Msys + Mingw info. diff --git a/generic/tclObj.c b/generic/tclObj.c index 23097f6..7a37fd3 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -13,7 +13,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.139.2.5 2009/10/18 11:21:38 mistachkin Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.139.2.6 2009/11/10 16:46:16 dgp Exp $ */ #include "tclInt.h" @@ -574,6 +574,17 @@ TclContinuationsEnter(Tcl_Obj* objPtr, ContLineLoc* clLocPtr = (ContLineLoc*) ckalloc (sizeof(ContLineLoc) + num*sizeof(int)); + if (newEntry == 0) { + /* + * Somehow we're entering ContLineLoc data for the same value 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 */ -- cgit v0.12