diff options
| author | fvogel <fvogelnew1@free.fr> | 2012-07-19 21:34:47 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2012-07-19 21:34:47 (GMT) |
| commit | 8d952115e0c16d94624b1688971b285f0a30be4d (patch) | |
| tree | f0569a80c445c705e8bd86960308902afb764b73 | |
| parent | e636ee749274262a51f2635ee3eafcd236a9bb91 (diff) | |
| parent | 15a136cf5c8d9f67733287cb7bad1e9b5adb1a26 (diff) | |
| download | tk-8d952115e0c16d94624b1688971b285f0a30be4d.zip tk-8d952115e0c16d94624b1688971b285f0a30be4d.tar.gz tk-8d952115e0c16d94624b1688971b285f0a30be4d.tar.bz2 | |
Bug 3545457: Crash on packing a menubutton
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | unix/tkUnixMenubu.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2012-07-?? Francois Vogel <fvogelnew1@free.fr> + + * unix/tkUnixMenuBu.c: [Bug 3545457]: Crash on packing a menubutton + 2012-07-17 Jan Nijtmans <nijtmans@users.sf.net> * win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index 35c7da8..785fb75 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -74,10 +74,12 @@ TkpDisplayMenuButton(clientData) * compiler warning. */ int y = 0; register Tk_Window tkwin = mbPtr->tkwin; - int width, height, fullWidth, fullHeight; + int fullWidth, fullHeight; int textXOffset, textYOffset; int imageWidth, imageHeight; - int imageXOffset, imageYOffset; /* image information that will be used to + int imageXOffset, imageYOffset; + int width = 0, height = 0; + /* image information that will be used to * restrict disabled pixmap as well */ int haveImage = 0, haveText = 0; |