Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit 1d506250bfbb · 2021-08-31T10:42:52.000+02:00
* PHP-7.4:
  Error on resource ID space overflow
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
@@ -37,6 +37,8 @@ ZEND_API zval* ZEND_FASTCALL zend_list_insert(void *ptr, int type)
 	index = zend_hash_next_free_element(&EG(regular_list));
 	if (index == 0) {
 		index = 1;
+	} else if (index == INT_MAX) {
+		zend_error_noreturn(E_ERROR, "Resource ID space overflow");
 	}
 	ZVAL_NEW_RES(&zv, index, ptr, type);
 	return zend_hash_index_add_new(&EG(regular_list), index, &zv);

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ ZEND_API zval* ZEND_FASTCALL zend_list_insert(void *ptr, int type)`
`37`	`37`	`index = zend_hash_next_free_element(&EG(regular_list));`
`38`	`38`	`if (index == 0) {`
`39`	`39`	`index = 1;`
	`40`	`+ } else if (index == INT_MAX) {`
	`41`	`+ zend_error_noreturn(E_ERROR, "Resource ID space overflow");`
`40`	`42`	`}`
`41`	`43`	`ZVAL_NEW_RES(&zv, index, ptr, type);`
`42`	`44`	`return zend_hash_index_add_new(&EG(regular_list), index, &zv);`