diff --git a/NEWS b/NEWS index 94f059ba547..a80740376ed 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.4.7 +- Core: + . Fixed bug #79566 (Private SHM is not private on Windows). (cmb) + - SimpleXML: . Fixed bug #79528 (Different object of the same xml between 7.4.5 and 7.4.4). (cmb) diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 40331f122c2..75240282f61 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -615,14 +615,16 @@ TSRM_API int shmget(key_t key, size_t size, int flags) {/*{{{*/ shm_pair *shm; char shm_segment[26], shm_info[29]; - HANDLE shm_handle, info_handle; + HANDLE shm_handle = NULL, info_handle = NULL; BOOL created = FALSE; - snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key); - snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key); + if (key != IPC_PRIVATE) { + snprintf(shm_segment, sizeof(shm_segment), "TSRM_SHM_SEGMENT:%d", key); + snprintf(shm_info, sizeof(shm_info), "TSRM_SHM_DESCRIPTOR:%d", key); - shm_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment); - info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info); + shm_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment); + info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info); + } if (!shm_handle && !info_handle) { if (flags & IPC_CREAT) { @@ -633,8 +635,8 @@ TSRM_API int shmget(key_t key, size_t size, int flags) DWORD high = 0; DWORD low = size; #endif - shm_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, high, low, shm_segment); - info_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), shm_info); + shm_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, high, low, key == IPC_PRIVATE ? NULL : shm_segment); + info_handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(shm->descriptor), key == IPC_PRIVATE ? NULL : shm_info); created = TRUE; } if (!shm_handle || !info_handle) { diff --git a/ext/shmop/tests/shmop_open_private.phpt b/ext/shmop/tests/shmop_open_private.phpt new file mode 100644 index 00000000000..df969885c9e --- /dev/null +++ b/ext/shmop/tests/shmop_open_private.phpt @@ -0,0 +1,23 @@ +--TEST-- +shmop_open with IPC_PRIVATE creates private SHM +--SKIPIF-- + +--FILE-- + +--EXPECT-- +bool(true)