Merge branch 'PHP-8.2' into PHP-8.3

nielsdos · nielsdos · commit 81ae6064ce1b · 2024-03-24T13:58:41.000+01:00
* PHP-8.2: [ci skip] NEWS Fix incorrect check in fpm_shm_free() (#13797)
diff --git a/NEWS b/NEWS
@@ -17,6 +17,7 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed GH-11086 (FPM: config test runs twice in daemonised mode).
     (Jakub Zelenka)
+  . Fix incorrect check in fpm_shm_free(). (nielsdos)
 
 - GD:
   . Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky)
diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
@@ -50,7 +50,7 @@ int fpm_shm_free(void *mem, size_t size) /* {{{ */
 		return 0;
 	}
 
-	if (fpm_shm_size - size > 0) {
+	if (fpm_shm_size > size) {
 		fpm_shm_size -= size;
 	} else {
 		fpm_shm_size = 0;

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ int fpm_shm_free(void mem, size_t size) / {{{ */`
`50`	`50`	`return 0;`
`51`	`51`	`}`
`52`	`52`
`53`		`- if (fpm_shm_size - size > 0) {`
	`53`	`+ if (fpm_shm_size > size) {`
`54`	`54`	`fpm_shm_size -= size;`
`55`	`55`	`} else {`
`56`	`56`	`fpm_shm_size = 0;`