archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Support fixed address mmap without replacement"

Browse source 
This reverts commit 0f68ff5c92.
This commit is contained in:
Remi Collet 2018-08-29 14:41:04 +02:00
parent 8cc7e2a2df
commit a55bcaa14d
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Zend/zend_alloc.c
View file

@ -423,13 +423,8 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size)
#ifdef _WIN32 #ifdef _WIN32
return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
#else #else
int flags = MAP_PRIVATE | MAP_ANON; /* MAP_FIXED leads to discarding of the old mapping, so it can't be used. */
#ifdef MAP_FIXED_NOREPLACE void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
flags |= MAP_FIXED_NOREPLACE;
#elif defined MAP_EXCL
flags |= MAP_FIXED | MAP_EXCL;
#endif
void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
#if ZEND_MM_ERROR #if ZEND_MM_ERROR