diff -ru --exclude='.*' --exclude='*.o' --exclude='*.so*' --exclude=depend.bak Mesa-6.5.orig/src/glx/x11/glxextensions.c Mesa-6.5/src/glx/x11/glxextensions.c
--- Mesa-6.5.orig/src/glx/x11/glxextensions.c	2006-03-31 19:29:46.000000000 +0200
+++ Mesa-6.5/src/glx/x11/glxextensions.c	2006-06-29 00:59:05.000000000 +0200
@@ -28,6 +28,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
+#include <assert.h>
 #include "glxclient.h"
 #include <X11/extensions/extutil.h>
 #include <X11/extensions/Xext.h>
@@ -424,6 +427,8 @@
       }
 
       for ( i = 0 ; known_gl_extensions[i].name != NULL ; i++ ) {
+         /* Just in case */
+         assert ( i < __NUM_GL_EXTS );
 	 const unsigned  bit = known_gl_extensions[i].bit;
 
 	 if ( known_gl_extensions[i].client_support ) {