Merge remote branch 'origin/master' into gallium_draw_llvm

[mesa.git] / src / glut / glx / glut_event.c

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index d6d963896a6fff8143f914956e60f4f774eac377..4cdb814d76a40d0b075d13e3a5fe85ee9ae89be1 100644 (file)
--- a/src/glut/glx/glut_event.c
+++ b/src/glut/glx/glut_event.c
@@ -664,6 +664,7 @@ processEventsAndTimeouts(void)
          case XK_KP_Delete: /* Introduced in X11R6. */
             /* The Delete character is really an ASCII key. */
             __glutSetWindow(window);
+            assert(keyboard);
             keyboard(127,  /* ASCII Delete character. */
               event.xkey.x, event.xkey.y);
             goto skip;
@@ -1311,6 +1312,7 @@ processWindowWorkList(GLUTwindow * window)
   }
   /* Combine workMask with window->workMask to determine what
      finish and debug work there is. */
+  assert(window);
   workMask |= window->workMask;
 
   if (workMask & GLUT_FINISH_WORK) {