[Bug 3545457]: Crash on packing a menubuttonbug_3545457

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bb34f20..77499c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;