Skip to content

Fix: mmap MAP_FAILED not handled correctly on POSIX #722

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

Open
DavIvek wants to merge 1 commit into
base: main-dev
Choose a base branch
from
Open

Fix: mmap MAP_FAILED not handled correctly on POSIX #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions cpp/bench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ struct alignas(32) persisted_matrix_gt {
if (fstat(file_descriptor, &stat_vectors) == -1)
throw std::invalid_argument("Couldn't obtain file stats");
raw_length = stat_vectors.st_size;
raw_handle = (std::uint8_t*)mmap(NULL, raw_length, PROT_READ, MAP_PRIVATE, file_descriptor, 0);
if (raw_handle == nullptr)
auto* result = mmap(NULL, raw_length, PROT_READ, MAP_PRIVATE, file_descriptor, 0);
if (result == MAP_FAILED)
throw std::invalid_argument("Couldn't memory-map the file");
raw_handle = (std::uint8_t*)result;
std::memcpy(&rows, raw_handle, sizeof(rows));
std::memcpy(&cols, raw_handle + sizeof(rows), sizeof(cols));
scalars = (scalar_t*)(raw_handle + sizeof(rows) + sizeof(cols));
Expand Down
3 changes: 2 additions & 1 deletion include/usearch/index_plugins.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,8 @@ class page_allocator_t {
#if defined(USEARCH_DEFINED_WINDOWS)
return (byte_t*)(::VirtualAlloc(NULL, count_bytes, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE));
#else
return (byte_t*)mmap(NULL, count_bytes, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
auto* result = mmap(NULL, count_bytes, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
return (result == MAP_FAILED) ? nullptr : (byte_t*)result;
#endif
}

Expand Down