diff options
| author | Remi Collet <remi@php.net> | 2013-12-19 10:54:06 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-12-19 10:54:06 +0100 |
| commit | 99b91f98b11c7279f8312506bd556f4c3e1e7fea (patch) | |
| tree | c9e42333a88ff38c27b1431308cf04b24d323d93 | |
| parent | 17470df2a508fc5b8aaaf10cd97673d5aa133692 (diff) | |
| parent | 32d1d5fb596dec74b555ff2077930e95cda1a3b0 (diff) | |
| download | php-git-99b91f98b11c7279f8312506bd556f4c3e1e7fea.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index cd1d7cd425..dc30c3ed5c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1555,7 +1555,7 @@ static ZIPARCHIVE_METHOD(open) RETURN_LONG((long)err); } ze_obj->filename = estrdup(resolved_path); - ze_obj->filename_len = filename_len; + ze_obj->filename_len = strlen(resolved_path); ze_obj->za = intern; RETURN_TRUE; } |