From ff53285ae3f604e9f2cc5f4837255220459b5e44 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 25 Aug 2012 13:53:37 -0700 Subject: [PATCH] Return connection failure if display string specifies non-existent screen Matches the behaviour of Xlib - if you set DISPLAY to :0.1 but only have one screen, closes connection and returns error. This introduces a new connection error code: XCB_CONN_CLOSED_INVALID_SCREEN Signed-off-by: Jeremy Huddleston Sequoia Signed-off-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston Sequoia Reviewed-by: Josh Triplett --- src/xcb.h | 4 ++++ src/xcb_conn.c | 5 +++++ src/xcb_util.c | 10 ++++++++++ 3 files changed, 19 insertions(+) diff --git a/src/xcb.h b/src/xcb.h index 179af84..f7dc6af 100644 --- a/src/xcb.h +++ b/src/xcb.h @@ -84,6 +84,9 @@ extern "C" { /** Connection closed, error during parsing display string. */ #define XCB_CONN_CLOSED_PARSE_ERR 5 +/** Connection closed because the server does not have a screen matching the display. */ +#define XCB_CONN_CLOSED_INVALID_SCREEN 6 + #define XCB_TYPE_PAD(T,I) (-(I) & (sizeof(T) > 4 ? 3 : sizeof(T) - 1)) /* Opaque structures */ @@ -423,6 +426,7 @@ int xcb_get_file_descriptor(xcb_connection_t *c); * @return XCB_CONN_CLOSED_MEM_INSUFFICIENT, when memory not available. * @return XCB_CONN_CLOSED_REQ_LEN_EXCEED, exceeding request length that server accepts. * @return XCB_CONN_CLOSED_PARSE_ERR, error during parsing display string. + * @return XCB_CONN_CLOSED_INVALID_SCREEN, because the server does not have a screen matching the display. */ int xcb_connection_has_error(xcb_connection_t *c); diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 7202cc5..7979491 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -66,6 +66,7 @@ typedef struct { static const int xcb_con_error = XCB_CONN_ERROR; static const int xcb_con_closed_mem_er = XCB_CONN_CLOSED_MEM_INSUFFICIENT; static const int xcb_con_closed_parse_er = XCB_CONN_CLOSED_PARSE_ERR; +static const int xcb_con_closed_screen_er = XCB_CONN_CLOSED_INVALID_SCREEN; static int set_fd_flags(const int fd) { @@ -349,6 +350,10 @@ xcb_connection_t *_xcb_conn_ret_error(int err) { return (xcb_connection_t *) &xcb_con_closed_parse_er; } + case XCB_CONN_CLOSED_INVALID_SCREEN: + { + return (xcb_connection_t *) &xcb_con_closed_screen_er; + } case XCB_CONN_ERROR: default: { 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); -- 2.34.1