diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:37:44 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:37:44 -0700 |
| commit | 17a53f9e60d0cd01fe271e245efa7306537acbcf (patch) | |
| tree | 32b9993f7e2f17b2ab07f20760af7d9704ef4cbe | |
| parent | e8b768dd92d3cb2a9ed45fe7ee2e9422405f7ad7 (diff) | |
| parent | 8ebdb1f5fd19cb15dd6ac7700c781ede5dcbba95 (diff) | |
| download | php-git-17a53f9e60d0cd01fe271e245efa7306537acbcf.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, '#'); |