Merge branch 'PHP-8.2'

iluuu1994 · iluuu1994 · commit 38cf52d8aa38 · 2023-05-08T17:07:04.000+02:00
* PHP-8.2:
  Fix use-of-uninitialized value in phar_object.c
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3709,7 +3709,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
`@@ -3709,7 +3709,7 @@ PHP_METHOD(Phar, offsetSet)`
`3709`	`3709`	`{`
`3710`	`3710`	`char fname, cont_str = NULL;`
`3711`	`3711`	`size_t fname_len, cont_len;`
`3712`		`- zval *zresource;`
	`3712`	`+ zval *zresource = NULL;`
`3713`	`3713`
`3714`	`3714`	`if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "pr", &fname, &fname_len, &zresource) == FAILURE`
`3715`	`3715`	`&& zend_parse_parameters(ZEND_NUM_ARGS(), "ps", &fname, &fname_len, &cont_str, &cont_len) == FAILURE) {`