summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2015-05-01 19:25:31 +0200
committerJulien Pauli <jpauli@php.net>2015-05-12 14:32:05 +0200
commitc3c87e499644c4db6f55f3a4f2abd0261df86553 (patch)
tree6b3df36d5f41fd2f9494cb5bee0bd53cf5e3107d /ext/zip/php_zip.c
parentc9c2794fe6d4d780e17cddfcab3beeefd2ba1667 (diff)
downloadphp-git-c3c87e499644c4db6f55f3a4f2abd0261df86553.tar.gz
return FALSE instead of NULL from ZipArchive::getStream when php_stream_zip_open() fails (fixes #67161)
Diffstat (limited to 'ext/zip/php_zip.c')
-rw-r--r--ext/zip/php_zip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index a547709875..1dd76fcba8 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2784,6 +2784,8 @@ static ZIPARCHIVE_METHOD(getStream)
stream = php_stream_zip_open(obj->filename, filename->val, mode STREAMS_CC);
if (stream) {
php_stream_to_zval(stream, return_value);
+ } else {
+ RETURN_FALSE;
}
}
/* }}} */