summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--generic/tkArgv.c5
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ca91bfd..34a0585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2008-04-07 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkArgv.c: fix -help mem explosion. [Bug 1936238] (bachmann)
+
2008-04-04 Pat Thoyts <patthoyts@users.sourceforge.net>
- * library/ttk/sizegrip.tcl: Don't resize if the toplevel is not resizable
- or the sizegrip has been disabled.
+ * library/ttk/sizegrip.tcl: Don't resize if the toplevel is not
+ resizable or the sizegrip has been disabled.
2008-04-03 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/generic/tkArgv.c b/generic/tkArgv.c
index 95991ee..55fe45e 100644
--- a/generic/tkArgv.c
+++ b/generic/tkArgv.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: tkArgv.c,v 1.11 2007/12/13 15:24:13 dgp Exp $
+ * RCS: @(#) $Id: tkArgv.c,v 1.12 2008/04/07 18:39:36 hobbs Exp $
*/
#include "tkInt.h"
@@ -337,7 +337,8 @@ PrintUsage(
* for default options. */
{
register Tk_ArgvInfo *infoPtr;
- size_t width, i, numSpaces;
+ size_t width, i;
+ int numSpaces; /* must be int to allow for negative values */
#define NUM_SPACES 20
static char spaces[] = " ";
char tmp[TCL_DOUBLE_SPACE];