Merge branch 'PHP-8.3'

* PHP-8.3:
  Prevent closing of unrelated handles
This commit is contained in:
Christoph M. Becker 2024-09-22 17:28:15 +02:00
commit 1d92796107
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
2 changed files with 4 additions and 0 deletions

3
NEWS
View File

@ -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)

View File

@ -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;