[Mesa-dev] [PATCH 1/2] glx: Fix another case of using req outside of the display lock

[Brian Paul]

On 06/01/2011 11:44 AM, Adam Jackson wrote:
> 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... */
>         }


Reviewed-by: Brian Paul <brianp at vmware.com>