php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #61139 gzopen leaks when specifying invalid mode

Browse Source 
Needs to be merged to 5.4.
This commit is contained in:
Nikita Popov
2012-02-19 14:39:29 +00:00
parent 957029f44a
commit ecd13fd184
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ext/zlib/tests/bug61139.phpt Normal file
View File

@@ -0,0 +1,14 @@
--TEST--
Bug #61139 (gzopen leaks when specifying invalid mode)
--SKIPIF--
<?php
if (!extension_loaded('zlib')) {
die('skip - zlib extension not loaded');
}
?>
--FILE--
<?php
gzopen('someFile', 'c');
--EXPECTF--
Warning: gzopen(): gzopen failed in %s on line %d

25
ext/zlib/zlib_fopen_wrapper.c
View File

@@ -109,7 +109,7 @@ php_stream_ops php_stream_gzio_ops = {
php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options,
char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
{
struct php_gz_stream_data_t *self = {0};
struct php_gz_stream_data_t *self;
php_stream *stream = NULL, *innerstream = NULL;
/* sanity check the stream: it can be either read-only or write-only */
@@ -120,8 +120,6 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mod
return NULL;
}
self = emalloc(sizeof(*self));
if (strncasecmp("compress.zlib://", path, 16) == 0) {
path += 16;
} else if (strncasecmp("zlib:", path, 5) == 0) {
@@ -134,32 +132,29 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mod
int fd;
if (SUCCESS == php_stream_cast(innerstream, PHP_STREAM_AS_FD, (void **) &fd, REPORT_ERRORS)) {
self->gz_file = gzdopen(dup(fd), mode);
self = emalloc(sizeof(*self));
self->stream = innerstream;
if (self->gz_file) {
self->gz_file = gzdopen(dup(fd), mode);
if (self->gz_file) {
stream = php_stream_alloc_rel(&php_stream_gzio_ops, self, 0, mode);
if (stream) {
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
return stream;
}
gzclose(self->gz_file);
}
efree(self);
if (options & REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "gzopen failed");
}
} else if (innerstream) {
php_stream_close(innerstream);
}
php_stream_close(innerstream);
}
if (stream) {
php_stream_close(stream);
}
if (self) {
efree(self);
}
return NULL;
}