com php-src: Fixed incompatible pointer type: ext/phar/phar_o bject.c
| From: | Xinchen Hui | Date: | Thu, 28 Aug 2014 03:34:00 +0000 |
| Subject: | com php-src: Fixed incompatible pointer type: ext/phar/phar_o bject.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81240@lists.php.net to get a copy of this message | ||
Commit: 007406c775b527a334a0964a624810afeb599ed5
Author: Xinchen Hui <laruence@php.net> Thu, 28 Aug 2014 11:34:00 +0800
Parents: 6954bd4ff68d2421a6555c792a0db96896ec515a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=007406c775b527a334a0964a624810afeb599ed5
Log:
Fixed incompatible pointer type
Changed paths:
M ext/phar/phar_object.c
Diff:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 0ce1c3f..ec4c288 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -3420,7 +3420,7 @@ PHP_METHOD(Phar, copy)
}
}
- if (phar_path_check(&newfile, &newfile_len, &pcr_error) > pcr_is_ok) {
+ if (phar_path_check(&newfile, (int *) &newfile_len, &pcr_error) > pcr_is_ok) {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC,
"file \"%s\" contains invalid characters %s, cannot be copied from
\"%s\" in phar %s", newfile, pcr_error, oldfile, phar_obj->archive->fname);
RETURN_FALSE;