Merge branch 'PHP-8.3'

cmb69 · cmb69 · commit 1d9279610784 · 2024-09-22T17:29:05.000+02:00
* PHP-8.3:
  Prevent closing of unrelated handles
diff --git a/NEWS b/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)
 
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -708,6 +708,7 @@ TSRM_API int shmget(key_t key, size_t size, int flags)`
`708`	`708`	`if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key \|\| size > shm->descriptor->shm_segsz)) {`
`709`	`709`	`if (NULL != shm->segment) {`
`710`	`710`	`CloseHandle(shm->segment);`
	`711`	`+ shm->segment = INVALID_HANDLE_VALUE;`
`711`	`712`	`}`
`712`	`713`	`UnmapViewOfFile(shm->descriptor);`
`713`	`714`	`shm->descriptor = NULL;`