X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_util.c;h=463d085f66422a9ea6670dedd31488029ab14bc0;hb=ff53285ae3f604e9f2cc5f4837255220459b5e44;hp=e480d75c6dd8ee7ed156c97243b902c78fe5e1c5;hpb=90889794ad882a6847bcffe52c4cc5dfd168f1f4;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_util.c b/src/xcb_util.c
index e480d75..463d085 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -467,6 +467,16 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
     else
         c = xcb_connect_to_fd(fd, 0);
 
+    if(c->has_error)
+        goto out;
+
+    /* Make sure requested screen number is in bounds for this server */
+    if((screenp != NULL) && (*screenp >= (int) c->setup->roots_len)) {
+        xcb_disconnect(c);
+        c = _xcb_conn_ret_error(XCB_CONN_CLOSED_INVALID_SCREEN);
+        goto out;
+    }
+
 out:
     free(host);
     free(protocol);