Added some sanity checking on max number of bottons and axes.

diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index 1ce30fa79911605b85c560472e9bd0c7f4ee5b11..fd8b29c59892498a0620d5debb122c2c2198c4ab 100644 (file)
--- a/src/Joystick/joystick.cxx
+++ b/src/Joystick/joystick.cxx
@@ -158,11 +158,13 @@ fgJoystickInit()
        JOYCAPS jsCaps ;
        joyGetDevCaps( i, &jsCaps, sizeof(jsCaps) );
        int nbuttons = jsCaps.wNumButtons;
+       if (nbuttons > MAX_BUTTONS) nbuttons = MAX_BUTTONS;
 #else
        int nbuttons = MAX_BUTTONS;
 #endif
        
        int naxes = js->getNumAxes();
+       if (naxes > MAX_AXES) naxes = MAX_AXES;
        joysticks[i].naxes = naxes;
        joysticks[i].nbuttons = nbuttons;