79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
From 81406c0c1d45f75fcc7972ed974d2597abb0b9e9 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Malyshev <stas@php.net>
|
|
Date: Tue, 12 Jul 2016 22:03:40 -0700
|
|
Subject: [PATCH] Fix fir bug #72520
|
|
|
|
---
|
|
ext/zip/zip_stream.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
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);
|
|
From 8ebdb1f5fd19cb15dd6ac7700c781ede5dcbba95 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Malyshev <stas@php.net>
|
|
Date: Tue, 19 Jul 2016 22:37:03 -0700
|
|
Subject: [PATCH] Improve fix for #72520
|
|
|
|
---
|
|
ext/zip/zip_stream.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c
|
|
index a9192d2..4517122 100644
|
|
--- a/ext/zip/zip_stream.c
|
|
+++ b/ext/zip/zip_stream.c
|
|
@@ -101,13 +101,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, '#');
|
