]> granicus.if.org Git - php/commitdiff
fix incompatible pointer
authorAnatol Belski <ab@php.net>
Thu, 28 Aug 2014 15:02:53 +0000 (17:02 +0200)
committerAnatol Belski <ab@php.net>
Thu, 28 Aug 2014 15:03:41 +0000 (17:03 +0200)
ext/phar/phar_object.c

index 0ce1c3f5691c8930a65448b5ce6298971a539b12..2d34cf6bfb0456afa401a6f48029ab413311b1b1 100755 (executable)
@@ -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)) {