Merge branch 'PHP-8.2' into PHP-8.3

cmb69 · cmb69 · commit ffc355c83fc1 · 2024-09-22T17:26:34.000+02:00
* PHP-8.2:
  Prevent closing of unrelated handles
diff --git a/NEWS b/NEWS
@@ -24,6 +24,9 @@ PHP                                                                        NEWS
   . Fixed bugs GH-15908 and GH-15026 (leak / assertion failure in streams.c).
     (nielsdos)
 
+- TSRM:
+  . Prevent closing of unrelated handles. (cmb)
+
 12 Sep 2024, PHP 8.3.12
 
 - Core:
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
@@ -707,6 +707,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
`@@ -707,6 +707,7 @@ TSRM_API int shmget(key_t key, size_t size, int flags)`
`707`	`707`	`if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key \|\| size > shm->descriptor->shm_segsz)) {`
`708`	`708`	`if (NULL != shm->segment) {`
`709`	`709`	`CloseHandle(shm->segment);`
	`710`	`+ shm->segment = INVALID_HANDLE_VALUE;`
`710`	`711`	`}`
`711`	`712`	`UnmapViewOfFile(shm->descriptor);`
`712`	`713`	`shm->descriptor = NULL;`