fix incompatible pointer

weltling · weltling · commit 9f1b68eda574 · 2014-08-28T17:03:41.000+02:00
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3379,6 +3379,7 @@ PHP_METHOD(Phar, copy)
 	const char *pcr_error;
 	size_t oldfile_len, newfile_len;
 	phar_entry_info *oldentry, newentry = {0}, *temp;
+	int tmp_len = 0;
 
 	PHAR_ARCHIVE_OBJECT();
 
@@ -3420,11 +3421,12 @@ PHP_METHOD(Phar, copy)
 		}
 	}
 
-	if (phar_path_check(&newfile, &newfile_len, &pcr_error) > pcr_is_ok) {
+	if (phar_path_check(&newfile, &tmp_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;
 	}
+	newfile_len = tmp_len;
 
 	if (phar_obj->archive->is_persistent) {
 		if (FAILURE == phar_copy_on_write(&(phar_obj->archive) TSRMLS_CC)) {

Original file line number	Diff line number	Diff line change
`@@ -3379,6 +3379,7 @@ PHP_METHOD(Phar, copy)`
`3379`	`3379`	`const char *pcr_error;`
`3380`	`3380`	`size_t oldfile_len, newfile_len;`
`3381`	`3381`	`phar_entry_info oldentry, newentry = {0}, temp;`
	`3382`	`+ int tmp_len = 0;`
`3382`	`3383`
`3383`	`3384`	`PHAR_ARCHIVE_OBJECT();`
`3384`	`3385`
`@@ -3420,11 +3421,12 @@ PHP_METHOD(Phar, copy)`
`3420`	`3421`	`}`
`3421`	`3422`	`}`
`3422`	`3423`
`3423`		`- if (phar_path_check(&newfile, &newfile_len, &pcr_error) > pcr_is_ok) {`
	`3424`	`+ if (phar_path_check(&newfile, &tmp_len, &pcr_error) > pcr_is_ok) {`
`3424`	`3425`	`zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC,`
`3425`	`3426`	`"file \"%s\" contains invalid characters %s, cannot be copied from \"%s\" in phar %s", newfile, pcr_error, oldfile, phar_obj->archive->fname);`
`3426`	`3427`	`RETURN_FALSE;`
`3427`	`3428`	`}`
	`3429`	`+ newfile_len = tmp_len;`
`3428`	`3430`
`3429`	`3431`	`if (phar_obj->archive->is_persistent) {`
`3430`	`3432`	`if (FAILURE == phar_copy_on_write(&(phar_obj->archive) TSRMLS_CC)) {`