Skip to content

Fix UBs in Stack creation, take 2. #14627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 2 commits into from
Aug 26, 2025
Merged

Fix UBs in Stack creation, take 2. #14627

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64ea0d4
Fix alignment so that jemalloc / address sanitizer do no complain
ktf Jul 23, 2025
e7f4752
Data Model: provide size when deallocating a Stack
ktf Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions DataFormats/Headers/include/Headers/Stack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ struct Stack {

private:
struct freeobj {
freeobj(memory_resource* mr) : resource(mr) {}
freeobj(memory_resource* mr, size_t s) : resource(mr), size(s) {}
memory_resource* resource{nullptr};
void operator()(std::byte* ptr) { resource->deallocate(ptr, 0, 0); }
size_t size{0};
void operator()(std::byte* ptr) { resource->deallocate(ptr, size, alignof(std::max_align_t)); }
};

public:
Expand Down Expand Up @@ -99,7 +100,7 @@ struct Stack {
Stack(const allocator_type allocatorArg, Headers&&... headers)
: allocator{allocatorArg},
bufferSize{calculateSize(std::forward<Headers>(headers)...)},
buffer{static_cast<std::byte*>(allocator.resource()->allocate(bufferSize, alignof(std::max_align_t))), freeobj{allocator.resource()}}
buffer{static_cast<std::byte*>(allocator.resource()->allocate(bufferSize, alignof(std::max_align_t))), freeobj{allocator.resource(), bufferSize}}
{
if constexpr (sizeof...(headers) > 1) {
injectAll(buffer.get(), std::forward<Headers>(headers)...);
Expand Down Expand Up @@ -142,7 +143,7 @@ struct Stack {
private:
allocator_type allocator{fair::mq::pmr::new_delete_resource()};
size_t bufferSize{0};
BufferType buffer{nullptr, freeobj{allocator.resource()}};
BufferType buffer{nullptr, freeobj{allocator.resource(), 0}};

//______________________________________________________________________________________________
template <typename T>
Expand Down
Loading