diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:37:44 -0700 |
|---|---|---|
| committer | Ferenc Kovacs <tyra3l@gmail.com> | 2016-07-21 02:08:10 +0200 |
| commit | 4711bc74cde10458285a2a5680bacf64470b2295 (patch) | |
| tree | 0b620220f940381153696e9619b981461f39fb6a | |
| parent | 44d96c42d220072995ea5074230ed91f1c8c36e4 (diff) | |
| download | php-git-4711bc74cde10458285a2a5680bacf64470b2295.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Improve fix for #72520
| -rw-r--r-- | ext/zip/zip_stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c index 2095ddf838..a0a34757a3 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -116,13 +116,13 @@ static int php_zip_ops_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_D { struct zip_stat sb; const char *path = stream->orig_path; - int path_len = strlen(stream->orig_path); + size_t path_len = strlen(stream->orig_path); char *file_basename; size_t file_basename_len; char file_dirname[MAXPATHLEN]; struct zip *za; char *fragment; - int fragment_len; + size_t fragment_len; int err; fragment = strchr(path, '#'); |