Skip to content

fix(windows): use tryProtect in BufferMemoryHandle destructor to prevent mprotect crash #170

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
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(windows): use tryProtect in BufferMemoryHandle destructor to prevent mprotect crash #170

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
16 changes: 16 additions & 0 deletions Source/JavaScriptCore/runtime/BufferMemoryHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,15 @@ BufferMemoryHandle::~BufferMemoryHandle()
// nullBasePointer's zero-sized memory is not used for MemoryMode::Signaling.
constexpr bool readable = true;
constexpr bool writable = true;
#if OS(WINDOWS)
// On Windows, VirtualFree(MEM_RELEASE) releases memory regardless of page
// protection state, so the protect call is not strictly necessary. Use
// tryProtect to avoid crashing if the underlying reservation was already
// released by the allocator (e.g. libpas recycling the virtual pages).
OSAllocator::tryProtect(memory, BufferMemoryHandle::fastMappedBytes(), readable, writable);
#else
OSAllocator::protect(memory, BufferMemoryHandle::fastMappedBytes(), readable, writable);
#endif
BufferMemoryManager::singleton().freeFastMemory(memory);
break;
}
Expand All @@ -269,7 +277,15 @@ BufferMemoryHandle::~BufferMemoryHandle()
}
constexpr bool readable = true;
constexpr bool writable = true;
#if OS(WINDOWS)
// On Windows, VirtualFree(MEM_RELEASE) releases memory regardless of page
// protection state, so the protect call is not strictly necessary. Use
// tryProtect to avoid crashing if the underlying reservation was already
// released by the allocator (e.g. libpas recycling the virtual pages).
OSAllocator::tryProtect(memory, m_mappedCapacity, readable, writable);
#else
OSAllocator::protect(memory, m_mappedCapacity, readable, writable);
#endif
BufferMemoryManager::singleton().freeGrowableBoundsCheckingMemory(memory, m_mappedCapacity);
break;
}
Expand Down