diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:38:54 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:38:54 -0700 |
| commit | dda0ea9b3af0c392be8d850ccdbe8a1bfa2badb6 (patch) | |
| tree | eb868db9042687e2dc1b2fc61a0564c7e6004504 /ext/zip/zip_stream.c | |
| parent | a179b148d7bc0be67848bc1433131d959b3e7e86 (diff) | |
| parent | df5ee7bc2557fd87a7e296d399cd947d68c1a4d3 (diff) | |
| download | php-git-dda0ea9b3af0c392be8d850ccdbe8a1bfa2badb6.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Improve fix for #72520
#72482, revert for 5.6 for now
Diffstat (limited to 'ext/zip/zip_stream.c')
| -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 1362e4d5ec..dea01529a0 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -123,11 +123,11 @@ static int php_zip_ops_stat(php_stream *stream, php_stream_statbuf *ssb) /* {{{ { 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_dirname[MAXPATHLEN]; struct zip *za; char *fragment; - int fragment_len; + size_t fragment_len; int err; zend_string *file_basename; |