Differential D18757 Diff 52594 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket.cc
- This file was added.
| --- src/3rdparty/chromium/base/posix/unix_domain_socket.cc.orig 2018-11-13 18:25:11 UTC | |||||
| +++ src/3rdparty/chromium/base/posix/unix_domain_socket.cc | |||||
| @@ -5,7 +5,10 @@ | |||||
| #include "base/posix/unix_domain_socket.h" | |||||
| #include <errno.h> | |||||
| +#include <sys/param.h> | |||||
| #include <sys/socket.h> | |||||
| +#include <sys/types.h> | |||||
| +#include <sys/ucred.h> | |||||
| #if !defined(OS_NACL_NONSFI) | |||||
| #include <sys/un.h> | |||||
| #endif | |||||
| @@ -28,6 +31,14 @@ namespace base { | |||||
| const size_t UnixDomainSocket::kMaxFileDescriptors = 16; | |||||
| +#ifndef SCM_CREDENTIALS | |||||
| +# define SCM_CREDENTIALS 0x9001 | |||||
| +#endif | |||||
| + | |||||
| +#ifndef SO_PASSCRED | |||||
| +# define SO_PASSCRED 0x9002 | |||||
| +#endif | |||||
| + | |||||
| #if !defined(OS_NACL_NONSFI) | |||||
| bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { | |||||
| int raw_socks[2]; | |||||
| @@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, | |||||
| #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) | |||||
| // The PNaCl toolchain for Non-SFI binary build and macOS do not support | |||||
| // ucred. macOS supports xucred, but this structure is insufficient. | |||||
| - + CMSG_SPACE(sizeof(struct ucred)) | |||||
| + + CMSG_SPACE(sizeof(struct cmsgcred)) | |||||
| #endif // OS_NACL_NONSFI or OS_MACOSX | |||||
| ; | |||||
| char control_buffer[kControlBufferSize]; | |||||
| @@ -175,14 +186,14 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, | |||||
| wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); | |||||
| wire_fds_len = payload_len / sizeof(int); | |||||
| } | |||||
| -#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) | |||||
| +#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) && !defined(OS_BSD) | |||||
| // The PNaCl toolchain for Non-SFI binary build and macOS do not support | |||||
| // SCM_CREDENTIALS. | |||||
| if (cmsg->cmsg_level == SOL_SOCKET && | |||||
| cmsg->cmsg_type == SCM_CREDENTIALS) { | |||||
| - DCHECK_EQ(payload_len, sizeof(struct ucred)); | |||||
| + DCHECK_EQ(payload_len, sizeof(struct cmsgcred)); | |||||
| DCHECK_EQ(pid, -1); | |||||
| - pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid; | |||||
| + pid = getpid(); | |||||
| } | |||||
| #endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) | |||||
| } | |||||