diff options
| author | jenglish <jenglish@flightlab.com> | 2008-07-04 19:06:02 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2008-07-04 19:06:02 (GMT) |
| commit | 2522c1a958eb895f1e4d576207c643353960ee56 (patch) | |
| tree | cdbb2a1f76fc7db31e619a48557007d96f1744bc /generic/ttk/ttkClamTheme.c | |
| parent | fded95f4e881432bcd0b9bb27baf0aad2ad99be9 (diff) | |
| download | tk-2522c1a958eb895f1e4d576207c643353960ee56.zip tk-2522c1a958eb895f1e4d576207c643353960ee56.tar.gz tk-2522c1a958eb895f1e4d576207c643353960ee56.tar.bz2 | |
Audit: ensure that output arguments to Tk_Get*FromObj() are initialized,
in case of erroneous style specifications [#2009213].
Diffstat (limited to 'generic/ttk/ttkClamTheme.c')
| -rw-r--r-- | generic/ttk/ttkClamTheme.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index cabdef3..2557046 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -1,5 +1,5 @@ /* - * $Id: ttkClamTheme.c,v 1.9 2007/12/13 15:26:26 dgp Exp $ + * $Id: ttkClamTheme.c,v 1.9.2.1 2008/07/04 19:06:03 jenglish Exp $ * * Copyright (C) 2004 Joe English * @@ -487,7 +487,7 @@ static void GripElementSize( { int horizontal = *((Ttk_Orient*)clientData) == TTK_ORIENT_HORIZONTAL; GripElement *grip = elementRecord; - int gripCount; + int gripCount = 0; Tcl_GetIntFromObj(NULL, grip->gripCountObj, &gripCount); if (horizontal) { @@ -506,8 +506,8 @@ static void GripElementDraw( GripElement *grip = elementRecord; GC lightGC = Ttk_GCForColor(tkwin,grip->lightColorObj,d); GC darkGC = Ttk_GCForColor(tkwin,grip->borderColorObj,d); - int gripPad = 1; - int i, gripCount; + int gripPad = 1, gripCount = 0; + int i; Tcl_GetIntFromObj(NULL, grip->gripCountObj, &gripCount); @@ -614,7 +614,7 @@ static void ThumbElementDraw( Drawable d, Ttk_Box b, unsigned state) { ScrollbarElement *sb = elementRecord; - int gripCount = 3, orient = TTK_ORIENT_HORIZONTAL; + int gripCount = 0, orient = TTK_ORIENT_HORIZONTAL; GC lightGC, darkGC; int x1, y1, x2, y2, dx, dy, i; const int w = WIN32_XDRAWLINE_HACK; |