Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit b71a961363a3 · 2023-05-08T17:06:57.000+02:00
* PHP-8.1:
  Fix use-of-uninitialized value in phar_object.c
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3699,7 +3699,7 @@ PHP_METHOD(Phar, offsetSet)
 {
 	char *fname, *cont_str = NULL;
 	size_t fname_len, cont_len;
-	zval *zresource;
+	zval *zresource = NULL;
 
 	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "pr", &fname, &fname_len, &zresource) == FAILURE
 	&& zend_parse_parameters(ZEND_NUM_ARGS(), "ps", &fname, &fname_len, &cont_str, &cont_len) == FAILURE) {

Original file line number	Diff line number	Diff line change
`@@ -3699,7 +3699,7 @@ PHP_METHOD(Phar, offsetSet)`
`3699`	`3699`	`{`
`3700`	`3700`	`char fname, cont_str = NULL;`
`3701`	`3701`	`size_t fname_len, cont_len;`
`3702`		`- zval *zresource;`
	`3702`	`+ zval *zresource = NULL;`
`3703`	`3703`
`3704`	`3704`	`if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "pr", &fname, &fname_len, &zresource) == FAILURE`
`3705`	`3705`	`&& zend_parse_parameters(ZEND_NUM_ARGS(), "ps", &fname, &fname_len, &cont_str, &cont_len) == FAILURE) {`