[Xcb-commit] libxcb: src

[GitLab Mirror]

 src/xcb_util.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 18e109d755c5ce18157fdabb6de8ee6845b348ff
Author: Matthieu Herrb <matthieu at herrb.eu>
Date:   Tue Feb 28 14:19:21 2023 +0100

    Fix xcb_connect() call with a custom xcb_auth_info_t
    
    If the function implementing xcb_connect is called directly with a
    custom xcb_auth_info_t then checking that the screen in $DISPLAY
    is valid is skipped.
    
    Reported by chohag AT jtan DOT com
    
    Signed-off-by: Matthieu Herrb <matthieu at herrb.eu>

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 2121098..30bcf79 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -532,10 +532,8 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
 
     if(auth) {
         c = xcb_connect_to_fd(fd, auth);
-        goto out;
     }
-
-    if(_xcb_get_auth_info(fd, &ourauth, display))
+    else if(_xcb_get_auth_info(fd, &ourauth, display))
     {
         c = xcb_connect_to_fd(fd, &ourauth);
         free(ourauth.name);