diff options
| author | Remi Collet <remi@php.net> | 2020-02-28 10:23:19 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-02-28 10:23:19 +0100 |
| commit | fb881cbdfc5db079f002b86565d2b1cd1b793448 (patch) | |
| tree | e0c59d3f7ec078ea02da10db5177a8fcdc0b279a /ext/zip/php_zip.c | |
| parent | cb881844204dd7b7f8a3661a086345ab29a62420 (diff) | |
| parent | 5b2d4c0eccafcd648e574012a1c5331d6e1b1a4f (diff) | |
| download | php-git-fb881cbdfc5db079f002b86565d2b1cd1b793448.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 22f9895ad8..9d704b0cbf 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1791,7 +1791,8 @@ static ZIPARCHIVE_METHOD(addFile) entry_name_len = ZSTR_LEN(filename); } - if (php_zip_add_file(intern, ZSTR_VAL(filename), ZSTR_LEN(filename), entry_name, entry_name_len, 0, 0) < 0) { + if (php_zip_add_file(intern, ZSTR_VAL(filename), ZSTR_LEN(filename), + entry_name, entry_name_len, offset_start, offset_len) < 0) { RETURN_FALSE; } else { RETURN_TRUE; |