summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f0b2981)
That saves us from a couple of strlen() calls.
Signed-off-by: Julien Danjou <julien@danjou.info>
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
#endif
#ifdef HAVE_ABSTRACT_SOCKETS
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
#endif
#ifdef HAVE_ABSTRACT_SOCKETS
-static int _xcb_open_abstract(char *protocol, const char *file);
+static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
#endif
static int _xcb_open(char *host, char *protocol, const int display)
#endif
static int _xcb_open(char *host, char *protocol, const int display)
#endif
static const char base[] = "/tmp/.X11-unix/X";
char file[sizeof(base) + 20];
#endif
static const char base[] = "/tmp/.X11-unix/X";
char file[sizeof(base) + 20];
}
/* display specifies Unix socket */
}
/* display specifies Unix socket */
- snprintf(file, sizeof(file), "%s%d", base, display);
+ filelen = snprintf(file, sizeof(file), "%s%d", base, display);
+ if(filelen < 0)
+ return -1;
+ /* snprintf may truncate the file */
+ filelen = MIN(filelen, sizeof(file) - 1);
#ifdef HAVE_ABSTRACT_SOCKETS
#ifdef HAVE_ABSTRACT_SOCKETS
- fd = _xcb_open_abstract(protocol, file);
+ fd = _xcb_open_abstract(protocol, file, filelen);
if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED))
return fd;
if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED))
return fd;
}
#ifdef HAVE_ABSTRACT_SOCKETS
}
#ifdef HAVE_ABSTRACT_SOCKETS
-static int _xcb_open_abstract(char *protocol, const char *file)
+static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen)
{
int fd;
struct sockaddr_un addr = {0};
{
int fd;
struct sockaddr_un addr = {0};
strcpy(addr.sun_path + 1, file);
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path + 1, file);
addr.sun_family = AF_UNIX;
- namelen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(file);
+ namelen = offsetof(struct sockaddr_un, sun_path) + 1 + filelen;
#ifdef HAVE_SOCKADDR_SUN_LEN
#ifdef HAVE_SOCKADDR_SUN_LEN
- addr.sun_len = 1 + strlen(file);
+ addr.sun_len = 1 + filelen;
#endif
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1)
#endif
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1)