hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-05-12 23:00:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

DMABuffer: reserve vector and avoid UB (#10317)

Browse source 
actually reserve the vector instead of initializing it with the
m_attrs.fd.size() adding 4 invalid fd entries, and later emplace_back
the valid ones.

sync_merge_data name is defined as char name[32] a fixed size array, and
c++ technically doesnt allow assigning string literals directly to array
fields in aggregate initializers, it may compile but is technically
undefined behaviour or ill formed. zero initalise it and use
std::ranges::copy_n instead.
This commit is contained in:
Tom Englund 2025-05-07 18:15:27 +02:00 committed by GitHub
parent e5df8cdc62
commit 0dfcba9825
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/protocols/types/DMABuffer.cpp
View file

@ -111,7 +111,9 @@ CFileDescriptor CDMABuffer::exportSyncFile() {
#if !defined(__linux__)
return {};
#else
std::vector<CFileDescriptor> syncFds(m_attrs.fds.size());
std::vector<CFileDescriptor> syncFds;
syncFds.reserve(m_attrs.fds.size());
for (const auto& fd : m_attrs.fds) {
if (fd == -1)
continue;
@ -135,12 +137,15 @@ CFileDescriptor CDMABuffer::exportSyncFile() {
continue;
}
const std::string name = "merged release fence";
struct sync_merge_data data{
.name = "merged release fence",
.name = {}, // zero-initialize name[]
.fd2 = fd.get(),
.fence = -1,
};
std::ranges::copy_n(name.c_str(), std::min(name.size() + 1, sizeof(data.name)), data.name);
if (doIoctl(syncFd.get(), SYNC_IOC_MERGE, &data) == 0)
syncFd = CFileDescriptor(data.fence);
else