Merge branch 'PHP-8.1'

cmb69 · cmb69 · commit f78ae8d1147f · 2022-07-25T16:33:15.000+02:00
* PHP-8.1: Fix GH-9033: Loading blacklist file can fail due to negative length
diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
@@ -276,12 +276,12 @@ static void zend_accel_blacklist_loadone(zend_blacklist *blacklist, char *filena
 		}
 
 		/* strip \" */
-		if (pbuf[0] == '\"' && pbuf[path_length - 1]== '\"') {
+		if (path_length > 0 && pbuf[0] == '\"' && pbuf[path_length - 1]== '\"') {
 			*pbuf++ = 0;
 			path_length -= 2;
 		}
 
-		if (path_length == 0) {
+		if (path_length <= 0) {
 			continue;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -276,12 +276,12 @@ static void zend_accel_blacklist_loadone(zend_blacklist blacklist, char filena`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/* strip \" */`
`279`		`- if (pbuf[0] == '\"' && pbuf[path_length - 1]== '\"') {`
	`279`	`+ if (path_length > 0 && pbuf[0] == '\"' && pbuf[path_length - 1]== '\"') {`
`280`	`280`	`*pbuf++ = 0;`
`281`	`281`	`path_length -= 2;`
`282`	`282`	`}`
`283`	`283`
`284`		`- if (path_length == 0) {`
	`284`	`+ if (path_length <= 0) {`
`285`	`285`	`continue;`
`286`	`286`	`}`
`287`	`287`