xserver: Branch 'master'

[GitLab Mirror]

 glx/vndcmds.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 709c6562975c3bea10dd0571527a4aac79a6bf6f
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 16 12:58:25 2018 -0400

    vnd: Fix a silly memory leak
    
    'disp' was already allocated by LookupVendorPrivDispatch above,
    clobbering it will do no good.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/glx/vndcmds.c b/glx/vndcmds.c
index 45b1eafaa..f0779d14a 100644
--- a/glx/vndcmds.c
+++ b/glx/vndcmds.c
@@ -386,10 +386,6 @@ static int dispatch_GLXVendorPriv(ClientPtr client)
         // Note that even if none of the vendors provides a dispatch stub,
         // we'll still add an entry to the dispatch table, so that we don't
         // have to look it up again later.
-        disp = (GlxVendorPrivDispatch *) malloc(sizeof(GlxVendorPrivDispatch));
-        if (disp == NULL) {
-            return BadAlloc;
-        }
 
         disp->proc = GetVendorDispatchFunc(stuff->glxCode,
                                            GlxCheckSwap(client,