Mesa (master): glx: Fix another case of using req outside of the display lock

Adam Jackson ajax at kemper.freedesktop.org
Thu Jun 2 19:28:39 UTC 2011


Module: Mesa
Branch: master
Commit: 776a2a54473194e2f0926902276a1f880cded91f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=776a2a54473194e2f0926902276a1f880cded91f

Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun  1 11:33:48 2011 -0400

glx: Fix another case of using req outside of the display lock

Reviewed-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>

---

 src/glx/glxcmds.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index dbfa0ed..8b4151d 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -644,13 +644,13 @@ glXCreateGLXPixmap(Display * dpy, XVisualInfo * vis, Pixmap pixmap)
       if (psc->driScreen == NULL)
          break;
       config = glx_config_find_visual(psc->visuals, vis->visualid);
-      pdraw = psc->driScreen->createDrawable(psc, pixmap, req->glxpixmap, config);
+      pdraw = psc->driScreen->createDrawable(psc, pixmap, xid, config);
       if (pdraw == NULL) {
          fprintf(stderr, "failed to create pixmap\n");
          break;
       }
 
-      if (__glxHashInsert(priv->drawHash, req->glxpixmap, pdraw)) {
+      if (__glxHashInsert(priv->drawHash, xid, pdraw)) {
          (*pdraw->destroyDrawable) (pdraw);
          return None;           /* FIXME: Check what we're supposed to do here... */
       }




More information about the mesa-commit mailing list