From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 10 May 2006 19:21:39 +0000 (+0000)
Subject: move check for event.xbutton.button <= GLUT_MAX_MENUS (see sf bug 1484284)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e7d84e258a006f1509de9f41c1bffc985dfb450;p=mesa.git

move check for event.xbutton.button <= GLUT_MAX_MENUS (see sf bug 1484284)
---

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index f997f772c70..4e67da674ed 100644
--- a/src/glut/glx/glut_event.c
+++ b/src/glut/glx/glut_event.c
@@ -439,11 +439,15 @@ processEventsAndTimeouts(void)
         } else {
           window = __glutGetWindow(event.xbutton.window);
           /* added button check for mice with > 3 buttons */
-          if (window && event.xbutton.button <= GLUT_MAX_MENUS) {
+          if (window) {
             GLUTmenu *menu;
 	    int menuNum;
 
-            menuNum = window->menu[event.xbutton.button - 1];
+            if (event.xbutton.button <= GLUT_MAX_MENUS)
+              menuNum = window->menu[event.xbutton.button - 1];
+            else
+              menuNum = 0;
+
             /* Make sure that __glutGetMenuByNum is only called if there
 	       really is a menu present. */
             if ((menuNum > 0) && (menu = __glutGetMenuByNum(menuNum))) {