From 7e159bb362ea2362854c55e166b0a20d05059183 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Mon, 25 Aug 2008 17:19:42 +0000
Subject: Fix crash reported by Don Porter.
---
ChangeLog | 12 ++++++++----
generic/tkImgPhoto.c | 4 +++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dbcff39..ba0c903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
+2008-08-25 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tkImgPhoto.c (ImgPhotoConfigureMaster): Ensure that uses of
+ TclStackAlloc and TclStackFree balance.
+
2008-08-25 Todd M. Helfter <tmh@users.sourceforge.net>
- The patch is associated with the bug tracker id: 1936220
- library/tkfbox.tcl : fix the multiple selection error for
- tk_getOpenFile -multiple 1 which fails on all unix platforms since
- the adoption of ttk widgets.
+ * library/tkfbox.tcl: Fix the multiple selection error for
+ tk_getOpenFile -multiple 1 which fails on all unix platforms since the
+ adoption of ttk widgets. [Bug 1936220]
2008-08-25 Donal K. Fellows <dkf@users.sf.net>
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 74bc6f0..2007559 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
* Department of Computer Science,
* Australian National University.
*
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.79 2008/08/25 11:44:04 dkf Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.80 2008/08/25 17:19:43 dkf Exp $
*/
#include "tclInt.h"
@@ -1678,6 +1678,7 @@ ImgPhotoConfigureMaster(
data = objv[i];
j--;
} else {
+ TclStackFree(interp, args);
Tcl_AppendResult(interp,
"value for \"-data\" missing", NULL);
return TCL_ERROR;
@@ -1688,6 +1689,7 @@ ImgPhotoConfigureMaster(
format = objv[i];
j--;
} else {
+ TclStackFree(interp, args);
Tcl_AppendResult(interp,
"value for \"-format\" missing", NULL);
return TCL_ERROR;
--
cgit v0.12