mirror of
https://github.com/php/php-src.git
synced 2024-11-23 01:44:06 +08:00
Merge branch 'PHP-8.3'
* PHP-8.3: Prevent closing of unrelated handles
This commit is contained in:
commit
1d92796107
3
NEWS
3
NEWS
@ -58,6 +58,9 @@ PHP NEWS
|
||||
. Fixed bugs GH-15908 and GH-15026 (leak / assertion failure in streams.c).
|
||||
(nielsdos)
|
||||
|
||||
- TSRM:
|
||||
. Prevent closing of unrelated handles. (cmb)
|
||||
|
||||
- Zip:
|
||||
. Added ZipArchive::ER_TRUNCATED_ZIP added in libzip 1.11. (Remi)
|
||||
|
||||
|
@ -708,6 +708,7 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
|
||||
if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
|
||||
if (NULL != shm->segment) {
|
||||
CloseHandle(shm->segment);
|
||||
shm->segment = INVALID_HANDLE_VALUE;
|
||||
}
|
||||
UnmapViewOfFile(shm->descriptor);
|
||||
shm->descriptor = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user