com php-src: Fix build: ext/zip/php_zip.c
| From: | Remi Collet | Date: | Mon, 07 Sep 2015 11:52:28 +0000 |
| Subject: | com php-src: Fix build: ext/zip/php_zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88939@lists.php.net to get a copy of this message | ||
Commit: debfc866d2971c69d4f47662fb4bb70feb0c0007
Author: Remi Collet <remi@php.net> Mon, 7 Sep 2015 13:52:28 +0200
Parents: d47029167dfc2184f9a630a75a55e145bff8b017
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=debfc866d2971c69d4f47662fb4bb70feb0c0007
Log:
Fix build
php_zip.c:1647:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
php_zip.c:1648:3: error: format not a string literal and no format arguments
[-Werror=format-security]
Changed paths:
M ext/zip/php_zip.c
Diff:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 0355db4..c203148 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1626,8 +1626,8 @@ static ZIPARCHIVE_METHOD(close)
ze_obj = (ze_zip_object*) zend_object_store_get_object(this TSRMLS_CC);
- if (err = zip_close(intern)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, zip_strerror(intern));
+ if ((err = zip_close(intern))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zip_strerror(intern));
zip_discard(intern);
}