com php-src: Merge branch 'PHP-5.6': ext/zip/php_zip.c
| From: | Christoph Michael Becker | Date: | Fri, 04 Sep 2015 22:43:41 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/zip/php_zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88914@lists.php.net to get a copy of this message | ||
Commit: 0836d6484cacfab2eac7b9fe3ca3e578ca0ced36
Author: Christoph M. Becker <cmb@php.net> Sat, 5 Sep 2015 00:43:41 +0200
Parents: 539db00538baeb24ba0ca3524b7bef796430dd21 b59ea797f53f560ae79c55c1ca4956b5e77203d2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0836d6484cacfab2eac7b9fe3ca3e578ca0ced36
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70322: ZipArchive::close() doesn't indicate errors
Bugs:
https://bugs.php.net/70322
Changed paths:
MM ext/zip/php_zip.c
Diff:
diff --cc ext/zip/php_zip.c
index a723a18,0355db4..99adb72
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -1493,18 -1614,20 +1493,20 @@@ close the zip archive *
static ZIPARCHIVE_METHOD(close)
{
struct zip *intern;
- zval *this = getThis();
+ zval *self = getThis();
ze_zip_object *ze_obj;
+ int err;
- if (!this) {
+ if (!self) {
RETURN_FALSE;
}
- ZIP_FROM_OBJECT(intern, this);
+ ZIP_FROM_OBJECT(intern, self);
- ze_obj = (ze_zip_object*) zend_object_store_get_object(this TSRMLS_CC);
+ ze_obj = Z_ZIP_P(self);
- if (zip_close(intern)) {
+ if (err = zip_close(intern)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, zip_strerror(intern));
zip_discard(intern);
}