diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:38:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:38:35 -0700 |
| commit | df5ee7bc2557fd87a7e296d399cd947d68c1a4d3 (patch) | |
| tree | e2163cddfde6d941e5184c637b4acc10027f0265 /ext/zip | |
| parent | ec97e78a8d13eb03df962f0e8604a603604b2042 (diff) | |
| parent | 17a53f9e60d0cd01fe271e245efa7306537acbcf (diff) | |
| download | php-git-df5ee7bc2557fd87a7e296d399cd947d68c1a4d3.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Improve fix for #72520
#72482, revert for 5.6 for now
Conflicts:
ext/zip/zip_stream.c
Diffstat (limited to 'ext/zip')
| -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 d586233dee..244ff4dfa5 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -124,11 +124,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; |