diff --git a/ChangeLog b/ChangeLog
index 4df3ec605..4a1725c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* GL/glx/glxcmdsswap.c:
+	Coverity #271: Fix an unbelievably boneheaded NULL chase.
+
 2006-04-02  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xnest/Pixmap.c:
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index ed1276f22..0f8b67496 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -345,7 +345,7 @@ int __glXSwapUseXFont(__GLXclientState *cl, GLbyte *pc)
 
 int __glXSwapQueryExtensionsString(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXQueryExtensionsStringReq *req = NULL;
+    xGLXQueryExtensionsStringReq *req = (xGLXQueryExtensionsStringReq *)pc;
     __GLX_DECLARE_SWAP_VARIABLES;
 
     __GLX_SWAP_SHORT(&req->length);