xserver: Branch 'master'

[GitLab Mirror]

 glx/glxcmds.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcb1de600a7656e4ee6434a8d2e2772ca9fd0473
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Apr 22 11:47:29 2021 -0400

    glx: Fix error return code in GLXGetDrawableAttributes
    
    This should only ever throw GLXBadDrawable, says the protocol spec.

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 8bf180378..368d66aa6 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -1873,7 +1873,7 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId)
         int err = dixLookupWindow((WindowPtr *)&pDraw, drawId, client,
                                   DixGetAttrAccess);
         if (err != Success)
-            return error;
+            return __glXError(GLXBadDrawable);
     }
     if (pGlxDraw)
         pDraw = pGlxDraw->pDraw;