diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 60b1e86d206..fb840eb6b7f 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -51,7 +51,7 @@
 #endif /* GLX_USE_WINDOWSGL */
 #endif
 #endif
-
+#include <limits.h>
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
@@ -1796,6 +1796,9 @@ glXSwapIntervalMESA(unsigned int interval)
 #ifdef GLX_DIRECT_RENDERING
    struct glx_context *gc = __glXGetCurrentContext();
 
+   if (interval > INT_MAX)
+      return GLX_BAD_VALUE;
+
    if (gc != &dummyContext && gc->isDirect) {
       struct glx_screen *psc;