Skip to content

Commit bd8e734

Browse files
committed
Merge branch 'PHP-8.6'
On master, remove the obsolete error cleanup and its unused options parameter. phar_get_archive() returns NULL on errors, so a returned archive has no error message to free. * PHP-8.6: Fix error buffer cleanup in phar_open_parsed_phar() (#25376)
2 parents 90fb1e6 + ce04b3f commit bd8e734

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

‎ext/phar/phar.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ static zend_result phar_open_parsed_phar(
489489
size_t fname_len,
490490
/* copyable & hash update */ zend_string *alias,
491491
bool is_data,
492-
uint32_t options,
493492
phar_archive_data** pphar,
494493
char **error
495494
) {
@@ -554,10 +553,6 @@ static zend_result phar_open_parsed_phar(
554553
*pphar = NULL;
555554
}
556555

557-
if (phar && error && !(options & REPORT_ERRORS)) {
558-
efree(error);
559-
}
560-
561556
return FAILURE;
562557
}
563558
}
@@ -1344,7 +1339,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 5, 6) zend_result phar_open_or_create_filename(
13441339
return FAILURE;
13451340
}
13461341
check_file:
1347-
if (phar_open_parsed_phar(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, is_data, options, test, &my_error) == SUCCESS) {
1342+
if (phar_open_parsed_phar(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, is_data, test, &my_error) == SUCCESS) {
13481343
*pphar = *test;
13491344

13501345
if ((*test)->is_data && !(*test)->is_tar && !(*test)->is_zip) {
@@ -1546,7 +1541,7 @@ zend_result phar_open_from_filename(
15461541
is_data = true;
15471542
}
15481543

1549-
if (phar_open_parsed_phar(fname, fname_len, alias, is_data, options, pphar, error) == SUCCESS) {
1544+
if (phar_open_parsed_phar(fname, fname_len, alias, is_data, pphar, error) == SUCCESS) {
15501545
return SUCCESS;
15511546
} else if (error && *error) {
15521547
return FAILURE;
@@ -2295,7 +2290,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(2) zend_result phar_open_executed_filename(/* copyab
22952290
return FAILURE;
22962291
}
22972292

2298-
if (phar_open_parsed_phar(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, false, REPORT_ERRORS, NULL, NULL) == SUCCESS) {
2293+
if (phar_open_parsed_phar(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, false, NULL, NULL) == SUCCESS) {
22992294
return SUCCESS;
23002295
}
23012296

0 commit comments

Comments
 (0)