summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-12-19 10:53:38 +0100
committerRemi Collet <remi@php.net>2013-12-19 10:53:38 +0100
commit20eb8e4d11d46c399f2920af0a552007d8d5d608 (patch)
treece6640d73ad5b83a097191c5c6a13aa6b358bf8d
parent3624a9ca7a8405f1e3983a34b495d8bb57d9b708 (diff)
downloadphp-git-20eb8e4d11d46c399f2920af0a552007d8d5d608.tar.gz
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
-rw-r--r--NEWS3
-rw-r--r--ext/zip/php_zip.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d3bd822885..6dea019bc3 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,9 @@ PHP NEWS
. Fixed bug #49634 (Segfault throwing an exception in a XSL registered
function). (Mike)
+- ZIP:
+ . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)
+
12 Dec 2013, PHP 5.4.23
- Core:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 1f435bbb00..31c66a56d4 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;
}