projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return connection failure if display string specifies non-existent screen
[free-sw/xcb/libxcb]
/
src
/
xcb_util.c
diff --git
a/src/xcb_util.c
b/src/xcb_util.c
index
9329b81
..
463d085
100644
(file)
--- a/
src/xcb_util.c
+++ b/
src/xcb_util.c
@@
-25,6
+25,10
@@
/* Utility functions implementable using only public APIs. */
/* Utility functions implementable using only public APIs. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <assert.h>
#include <sys/types.h>
#include <limits.h>
#include <assert.h>
#include <sys/types.h>
#include <limits.h>
@@
-51,7
+55,6
@@
#include "xcbext.h"
#include "xcbint.h"
#include "xcbext.h"
#include "xcbint.h"
-/* must be after "xcbint.h" to get autoconf #defines */
#if defined(HAVE_TSOL_LABEL_H) && defined(HAVE_IS_SYSTEM_LABELED)
# include <tsol/label.h>
# include <sys/stat.h>
#if defined(HAVE_TSOL_LABEL_H) && defined(HAVE_IS_SYSTEM_LABELED)
# include <tsol/label.h>
# include <sys/stat.h>
@@
-175,7
+178,7
@@
static int _xcb_open(const char *host, char *protocol, const int display)
if(strncmp(host, "/tmp/launch", 11) == 0) {
base = host;
host = "";
if(strncmp(host, "/tmp/launch", 11) == 0) {
base = host;
host = "";
- protocol =
NULL
;
+ protocol =
"unix"
;
}
#endif
}
#endif
@@
-235,6
+238,11
@@
static int _xcb_open(const char *host, char *protocol, const int display)
fd = _xcb_open_unix(protocol, file);
free(file);
fd = _xcb_open_unix(protocol, file);
free(file);
+ if (fd < 0 && !protocol && *host == '\0') {
+ unsigned short port = X_TCP_PORT + display;
+ fd = _xcb_open_tcp(host, protocol, port);
+ }
+
return fd;
#endif /* !_WIN32 */
return -1; /* if control reaches here then something has gone wrong */
return fd;
#endif /* !_WIN32 */
return -1; /* if control reaches here then something has gone wrong */
@@
-430,7
+438,7
@@
xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
#ifdef _WIN32
WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
#ifdef _WIN32
WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
- c =
(xcb_connection_t *) &error_connection
;
+ c =
_xcb_conn_ret_error(XCB_CONN_ERROR)
;
goto out;
}
#endif
goto out;
}
#endif
@@
-459,6
+467,16
@@
xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
else
c = xcb_connect_to_fd(fd, 0);
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);
out:
free(host);
free(protocol);