diff options
| author | Remi Collet <remi@php.net> | 2013-12-19 10:53:50 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-12-19 10:53:50 +0100 |
| commit | 32d1d5fb596dec74b555ff2077930e95cda1a3b0 (patch) | |
| tree | b152dcf5c1c02639beac356640f42745a5e3dbb9 | |
| parent | 391fe528b71a20e16c0eae08bd99fa8f95ce00b6 (diff) | |
| parent | 20eb8e4d11d46c399f2920af0a552007d8d5d608 (diff) | |
| download | php-git-32d1d5fb596dec74b555ff2077930e95cda1a3b0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 d3ec27bafe..805fc1eba5 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1537,7 +1537,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; } |