yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix XWayland abstract socket address.

Browse source 
NUL-termination byte is not needed for abstract socket. This leads to
XWayland listening to a wrong address.

Confirmed with lsof.

BUG: 442362
This commit is contained in:
Weng Xuetian 2021-11-11 12:25:13 -08:00 committed by Vlad Zahorodnii
parent 0afd0aa4be
commit 83a036e9d4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xwl/lib/xwaylandsocket.cpp
View file

@ -42,19 +42,18 @@ UnixSocketAddress::UnixSocketAddress(const QString &socketPath, Type type)
const QByteArray encodedSocketPath = QFile::encodeName(socketPath);
int byteCount = offsetof(sockaddr_un, sun_path) + encodedSocketPath.size() + 1;
if (type == Type::Abstract) {
byteCount++; // For the first '\0'.
}
m_buffer.resize(byteCount);
sockaddr_un *address = reinterpret_cast<sockaddr_un *>(m_buffer.data());
address->sun_family = AF_UNIX;
if (type == Type::Unix) {
qstrcpy(address->sun_path, encodedSocketPath);
memcpy(address->sun_path, encodedSocketPath.data(), encodedSocketPath.size());
address->sun_path[encodedSocketPath.size()] = '\0';
} else {
// Abstract domain socket does not need the NUL-termination byte.
*address->sun_path = '\0';
qstrcpy(address->sun_path + 1, encodedSocketPath);
memcpy(address->sun_path + 1, encodedSocketPath.data(), encodedSocketPath.size());
}
}