Merge branch 'PHP-8.1' into PHP-8.2

nielsdos · nielsdos · commit bbcf9e710734 · 2023-05-24T20:09:56.000+02:00
* PHP-8.1:
  Fix allocation loop in zend_shared_alloc_startup()
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.2.8
 
+- Opcache:
+  . Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
+
 - PCRE:
   . Fix preg_replace_callback_array() pattern validation. (ilutov)
 
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -180,8 +180,8 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
 				res = zend_shared_alloc_try(he, requested_size, &ZSMMG(shared_segments), &ZSMMG(shared_segments_count), &error_in);
 				if (res) {
 					/* this model works! */
+					break;
 				}
-				break;
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)`
`180`	`180`	`res = zend_shared_alloc_try(he, requested_size, &ZSMMG(shared_segments), &ZSMMG(shared_segments_count), &error_in);`
`181`	`181`	`if (res) {`
`182`	`182`	`/* this model works! */`
	`183`	`+ break;`
`183`	`184`	`}`
`184`		`- break;`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`	`}`