From: Vinson Lee <vlee@vmware.com>
Date: Sun, 28 Feb 2010 05:19:07 +0000 (-0800)
Subject: glut: Add asserts to check for null pointer dereferences.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edd6c338cfa69b6bf9cac0922ebb9518fbca7eed;p=mesa.git

glut: Add asserts to check for null pointer dereferences.
---

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index d6d963896a6..4cdb814d76a 100644
--- 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) {