diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2009-04-02 17:30:19 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2009-04-07 16:28:26 -0400 |
| commit | f70cfc8f90091ef0f5ed0a5b2e023e7fd6369b36 (patch) | |
| tree | 69d9594077821aa49442983a41a2d591d18a3bd1 | |
| parent | 30d81ad72e870cc37754bd8c8aadf605450ec16e (diff) | |
Don't stomp on dixLookupDrawable() return value in DoCreateGLXPixmap().
| -rw-r--r-- | glx/glxcmds.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 7197204ef..ec122407b 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -1106,7 +1106,11 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config int err; err = dixLookupDrawable(&pDraw, drawableId, client, 0, DixAddAccess); - if (err != Success || pDraw->type != DRAWABLE_PIXMAP) { + if (err != Success) { + client->errorValue = drawableId; + return err; + } + if (pDraw->type != DRAWABLE_PIXMAP) { client->errorValue = drawableId; return BadPixmap; } |