summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2012-07-18 18:38:42 (GMT)
committerfvogel <fvogelnew1@free.fr>2012-07-18 18:38:42 (GMT)
commit15a136cf5c8d9f67733287cb7bad1e9b5adb1a26 (patch)
treef0569a80c445c705e8bd86960308902afb764b73 /unix
parente636ee749274262a51f2635ee3eafcd236a9bb91 (diff)
downloadtk-15a136cf5c8d9f67733287cb7bad1e9b5adb1a26.zip
tk-15a136cf5c8d9f67733287cb7bad1e9b5adb1a26.tar.gz
tk-15a136cf5c8d9f67733287cb7bad1e9b5adb1a26.tar.bz2
[Bug 3545457]: Crash on packing a menubuttonbug_3545457
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixMenubu.c6
1 files changed, 4 insertions, 2 deletions
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;