php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Fix GH-20882: phar buildFromIterator breaks with missing base directory
This commit is contained in:
Niels Dossche
2026-01-10 15:10:53 +01:00
parent 265c0c632b b18b11ee28
commit fb27990d3d
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/phar/phar_object.c
View File

@@ -1384,12 +1384,12 @@ static int phar_build(zend_object_iterator *iter, void *puser) /* {{{ */
zval *value;
bool close_fp = true;
struct _phar_t *p_obj = (struct _phar_t*) puser;
size_t str_key_len, base_len = ZSTR_LEN(p_obj->base);
size_t str_key_len, base_len = p_obj->base ? ZSTR_LEN(p_obj->base) : 0;
phar_entry_data *data;
php_stream *fp;
size_t fname_len;
size_t contents_len;
char *fname = NULL, *error = NULL, *base = ZSTR_VAL(p_obj->base), *save = NULL, *temp = NULL;
char *fname = NULL, *error = NULL, *base = p_obj->base ? ZSTR_VAL(p_obj->base) : NULL, *save = NULL, *temp = NULL;
zend_string *opened;
char *str_key;
zend_class_entry *ce = p_obj->c;

22
ext/phar/tests/gh20882.phpt Normal file
View File

@@ -0,0 +1,22 @@
--TEST--
GH-20882 (phar buildFromIterator breaks with missing base directory)
--EXTENSIONS--
phar
--INI--
phar.readonly=0
--FILE--
<?php
$phar = new \Phar(__DIR__ . "/test.phar");
try {
$phar->buildFromIterator(
new RecursiveIteratorIterator(
new RecursiveDirectoryIterator(__DIR__.'/test79082', FilesystemIterator::SKIP_DOTS)
),
null
);
} catch (BadMethodCallException $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Iterator RecursiveIteratorIterator returns an SplFileInfo object, so base directory must be specified