frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test the value of msg_controllen for platforms whose CMSG_FIRSTHDR() does not test it for us 

As RFC 2292 points out, some platforms (e.g. Darwin 9.8.0) provide
CMSG_FIRSTHDR(msg) which just returns msg.msg_control without first
checking if msg.msg_controllen is non-zero. We need a workaround for
such platforms not to let _xcb_in_read() segfault.

https://bugs.freedesktop.org/show_bug.cgi?id=72253

Signed-off-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
PHO 2013-12-03 12:43:04 +09:00 committed by Julien Cristau
parent b30b11ac49
commit a1299eb2a2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xcb_in.c
View File

@ -918,11 +918,13 @@ int _xcb_in_read(xcb_connection_t *c)
#if HAVE_SENDMSG #if HAVE_SENDMSG
struct cmsghdr *hdr; struct cmsghdr *hdr;
for (hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) { if (msg.msg_controllen >= sizeof (struct cmsghdr)) {
if (hdr->cmsg_level == SOL_SOCKET && hdr->cmsg_type == SCM_RIGHTS) { for (hdr = CMSG_FIRSTHDR(&msg); hdr; hdr = CMSG_NXTHDR(&msg, hdr)) {
int nfd = (hdr->cmsg_len - CMSG_LEN(0)) / sizeof (int); if (hdr->cmsg_level == SOL_SOCKET && hdr->cmsg_type == SCM_RIGHTS) {
memcpy(&c->in.in_fd.fd[c->in.in_fd.nfd], CMSG_DATA(hdr), nfd * sizeof (int)); int nfd = (hdr->cmsg_len - CMSG_LEN(0)) / sizeof (int);
c->in.in_fd.nfd += nfd; memcpy(&c->in.in_fd.fd[c->in.in_fd.nfd], CMSG_DATA(hdr), nfd * sizeof (int));
c->in.in_fd.nfd += nfd;
}
} }
} }
#endif #endif