Fix use-of-uninitialized value in phar_object.c

iluuu1994 · iluuu1994 · commit 78ec64af44a0 · 2023-05-08T17:06:44.000+02:00
resource would stay uninitialized if the first call to zend_parse_parameters fails, but the value is still passed to phar_add_file(). It's not used there if cont_str is provided and so didn't cause any issues. Closes GH-11202
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3697,7 +3697,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
`@@ -3697,7 +3697,7 @@ PHP_METHOD(Phar, offsetSet)`
`3697`	`3697`	`{`
`3698`	`3698`	`char fname, cont_str = NULL;`
`3699`	`3699`	`size_t fname_len, cont_len;`
`3700`		`- zval *zresource;`
	`3700`	`+ zval *zresource = NULL;`
`3701`	`3701`
`3702`	`3702`	`if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "pr", &fname, &fname_len, &zresource) == FAILURE`
`3703`	`3703`	`&& zend_parse_parameters(ZEND_NUM_ARGS(), "ps", &fname, &fname_len, &cont_str, &cont_len) == FAILURE) {`