com php-src: Fix fir bug #72520: ext/zip/zip_stream.c
| From: | Stanislav Malyshev | Date: | Wed, 13 Jul 2016 05:05:00 +0000 |
| Subject: | com php-src: Fix fir bug #72520: ext/zip/zip_stream.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93104@lists.php.net to get a copy of this message | ||
Commit: 81406c0c1d45f75fcc7972ed974d2597abb0b9e9
Author: Stanislav Malyshev <stas@php.net> Tue, 12 Jul 2016 22:03:40 -0700
Parents: 0218acb7e756a469099c4ccfb22bce6c2bd1ef87
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=81406c0c1d45f75fcc7972ed974d2597abb0b9e9
Log:
Fix fir bug #72520
Bugs:
https://bugs.php.net/72520
Changed paths:
M ext/zip/zip_stream.c
Diff:
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c
index 400edd6..a9192d2 100644
--- a/ext/zip/zip_stream.c
+++ b/ext/zip/zip_stream.c
@@ -214,7 +214,7 @@ php_stream *php_stream_zip_open(char *filename, char *path, char *mode STREAMS_D
self = emalloc(sizeof(*self));
self->za = stream_za;
- self->zf = zf;
+ self->zf = zf;
self->stream = NULL;
self->cursor = 0;
stream = php_stream_alloc(&php_stream_zipio_ops, self, NULL, mode);
@@ -241,7 +241,7 @@ php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper,
char **opened_path,
php_stream_context *context STREAMS_DC TSRMLS_DC)
{
- int path_len;
+ size_t path_len;
char *file_basename;
size_t file_basename_len;
@@ -250,7 +250,7 @@ php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper,
struct zip *za;
struct zip_file *zf = NULL;
char *fragment;
- int fragment_len;
+ size_t fragment_len;
int err;
php_stream *stream = NULL;
@@ -293,7 +293,7 @@ php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper,
self = emalloc(sizeof(*self));
self->za = za;
- self->zf = zf;
+ self->zf = zf;
self->stream = NULL;
self->cursor = 0;
stream = php_stream_alloc(&php_stream_zipio_ops, self, NULL, mode);