diff options
| author | jenglish <jenglish@flightlab.com> | 2008-07-04 19:05:03 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2008-07-04 19:05:03 (GMT) |
| commit | 71beb13aef5469536491f6d9377e151d077720a5 (patch) | |
| tree | 8bf612256385f9fb1bc7fd15c467c7a4368808c6 /generic/ttk/ttkElements.c | |
| parent | 2ae7f2cdd395b7ff0ad3bfa144c8d71cc9fbc346 (diff) | |
| download | tk-71beb13aef5469536491f6d9377e151d077720a5.zip tk-71beb13aef5469536491f6d9377e151d077720a5.tar.gz tk-71beb13aef5469536491f6d9377e151d077720a5.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/ttkElements.c')
| -rw-r--r-- | generic/ttk/ttkElements.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c index 78d314d..56bdccb 100644 --- a/generic/ttk/ttkElements.c +++ b/generic/ttk/ttkElements.c @@ -1,4 +1,4 @@ -/* $Id: ttkElements.c,v 1.10 2007/12/13 15:26:26 dgp Exp $ +/* $Id: ttkElements.c,v 1.11 2008/07/04 19:05:04 jenglish Exp $ * * Copyright (c) 2003, Joe English * @@ -957,7 +957,7 @@ static void SliderElementDraw( { SliderElement *slider = elementRecord; Tk_3DBorder border = NULL; - int relief, borderWidth, orient; + int relief = TK_RELIEF_RAISED, borderWidth = 2, orient; border = Tk_Get3DBorderFromObj(tkwin, slider->borderObj); Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient); @@ -1043,7 +1043,7 @@ static void PbarElementSize( int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) { PbarElement *pbar = elementRecord; - int orient, thickness, length, borderWidth; + int orient, thickness = 15, length = 30, borderWidth = 2; Ttk_GetOrientFromObj(NULL, pbar->orientObj, &orient); Tk_GetPixelsFromObj(NULL, tkwin, pbar->thicknessObj, &thickness); @@ -1068,7 +1068,7 @@ static void PbarElementDraw( { PbarElement *pbar = elementRecord; Tk_3DBorder border = Tk_Get3DBorderFromObj(tkwin, pbar->borderObj); - int relief, borderWidth; + int relief = TK_RELIEF_RAISED, borderWidth = 2; Tk_GetPixelsFromObj(NULL, tkwin, pbar->borderWidthObj, &borderWidth); Tk_GetReliefFromObj(NULL, pbar->reliefObj, &relief); |