Skip to content

Fixed issue #60953 #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Fixed issue #60953 #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
062faf8
Fixed issue #60953
ralphschindler Mar 5, 2013
47e8f32
Updated phar_object.c to use separate variables and estrndup()
ralphschindler Sep 1, 2013
a7a9f4c
Fixed tab->space
ralphschindler Oct 10, 2013
788ac67
PR #297 / Bug #60953
ralphschindler Mar 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,7 +2003,8 @@ static zend_object *phar_rename_archive(phar_archive_data *phar, char *ext, zend
const char *oldname = NULL;
char *oldpath = NULL;
char *basename = NULL, *basepath = NULL;
char *newname = NULL, *newpath = NULL;
char *newbasename = NULL, *newname = NULL, *newpath = NULL;
char *oldname_ext = NULL;
zval ret, arg1;
zend_class_entry *ce;
char *error;
Expand Down Expand Up @@ -2074,18 +2075,33 @@ static zend_object *phar_rename_archive(phar_archive_data *phar, char *ext, zend
}

oldpath = estrndup(phar->fname, phar->fname_len);
if ((oldname = zend_memrchr(phar->fname, '/', phar->fname_len))) {
++oldname;
} else {
oldname = phar->fname;
}
oldname = zend_memrchr(phar->fname, '/', phar->fname_len);
++oldname;
oldname_len = strlen(oldname);

basename = estrndup(oldname, oldname_len);
spprintf(&newname, 0, "%s.%s", strtok(basename, "."), ext);
efree(basename);

/* find extension name: .phar suffixed with anything and .zip* and .tar* without .phar for data archives */
oldname_ext = strstr(basename, ".phar");
if (oldname_ext == NULL) {
oldname_ext = strstr(basename, ".tar");
if (oldname_ext == NULL) {
oldname_ext = strstr(basename, ".tgz");
if (oldname_ext == NULL) {
oldname_ext = strstr(basename, ".zip");
}
}
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could make the code be far less indented and more readable and more maintainable by using something like:

    int i;
    char *extensions[] = {
        ".phar",
        ".tar",
        ".tgz",
        ".zip"
    };

    int extension_count = sizeof(extensions)/sizeof(extensions[0]);

    for (i=0 ; oldname_ext == NULL && i < extension_count ; i++){
        oldname_ext = strstr(basename, extensions[i]);
    }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have this exact-ish (similar) thing locally as I need to add one more extension (tbz2), will push it tonight. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree, Dan's code looks much cleaner.

newbasename = basename;

if (oldname_ext != NULL) {
newbasename = estrndup(basename, (oldname_ext - basename));
}

spprintf(&newname, 0, "%s.%s", newbasename, ext);
efree(newbasename);
efree(basename);

basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len));
phar->fname_len = spprintf(&newpath, 0, "%s%s", basepath, newname);
Expand Down
4 changes: 2 additions & 2 deletions ext/phar/tests/bug48377.2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.zip';
$phar = new PharData($fname);
$phar['x'] = 'hi';
try {
$phar->convertToData(Phar::ZIP, Phar::NONE, '.2.phar.zip');
$phar->convertToData(Phar::ZIP, Phar::NONE, 'zip');
} catch (BadMethodCallException $e) {
echo $e->getMessage(),"\n";
}
Expand All @@ -21,5 +21,5 @@ try {
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');?>
--EXPECTF--
data phar "%sbug48377.2.phar.zip" has invalid extension 2.phar.zip
Unable to add newly converted phar "%sbug48377.2.zip" to the list of phars, a phar with that name already exists
===DONE===
26 changes: 26 additions & 0 deletions ext/phar/tests/bug60953.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
Phar: rename test
--SKIPIF--
<?php if (!extension_loaded("phar")) die("skip"); ?>
--INI--
phar.readonly=0
phar.require_hash=0
--FILE--
<?php
$phar = new Phar(__DIR__ . '/package-1.2.3.phar');
$phar['hello.txt'] = 'Hello World';
$phar->stopBuffering();
unset($phar);
$phar = new Phar(__DIR__ . '/package-1.2.3.phar');
$phar->convertToExecutable(Phar::TAR, Phar::GZ);
var_dump(file_exists(__DIR__ . '/package-1.2.3.phar'));
var_dump(file_exists(__DIR__ . '/package-1.2.3.phar.tar.gz'));
?>
--CLEAN--
<?php
unlink(__DIR__ . '/package-1.2.3.phar');
unlink(__DIR__ . '/package-1.2.3.phar.tar.gz');
?>
--EXPECTF--
bool(true)
bool(true)
20 changes: 10 additions & 10 deletions ext/phar/tests/phar_convert_repeated.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var_dump($phar->getAlias());

echo "================= convertToPhar() ====================\n";

$phar = $phar->convertToExecutable(Phar::PHAR, Phar::NONE, '.2.phar');
$phar = $phar->convertToExecutable(Phar::PHAR, Phar::NONE, '.phar.pharfile');
var_dump($phar->isFileFormat(Phar::PHAR));
var_dump($phar->isFileFormat(Phar::TAR));
var_dump($phar->isFileFormat(Phar::ZIP));
Expand All @@ -59,7 +59,7 @@ var_dump($phar->getAlias());

echo "================= convertToZip() =====================\n";

$phar = $phar->convertToExecutable(Phar::ZIP, Phar::NONE, '.2.phar.zip');
$phar = $phar->convertToExecutable(Phar::ZIP, Phar::NONE, '.phar.zipfile');
var_dump($phar->isFileFormat(Phar::PHAR));
var_dump($phar->isFileFormat(Phar::TAR));
var_dump($phar->isFileFormat(Phar::ZIP));
Expand All @@ -68,7 +68,7 @@ var_dump($phar->getAlias());

echo "================= convertToTar() =====================\n";

$phar = $phar->convertToExecutable(Phar::TAR, Phar::NONE, '2.phar.tar');
$phar = $phar->convertToExecutable(Phar::TAR, Phar::NONE, '.phar.tarfile');
var_dump($phar->isFileFormat(Phar::PHAR));
var_dump($phar->isFileFormat(Phar::TAR));
var_dump($phar->isFileFormat(Phar::ZIP));
Expand All @@ -77,7 +77,7 @@ var_dump($phar->getAlias());

echo "================= convertToZip() =====================\n";

$phar = $phar->convertToExecutable(Phar::ZIP, Phar::NONE, '3.phar.zip');
$phar = $phar->convertToExecutable(Phar::ZIP, Phar::NONE, '.phar.zip2');
var_dump($phar->isFileFormat(Phar::PHAR));
var_dump($phar->isFileFormat(Phar::TAR));
var_dump($phar->isFileFormat(Phar::ZIP));
Expand All @@ -91,12 +91,12 @@ var_dump($phar->getAlias());
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar.zip');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar.tar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.3.phar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zipfile');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tarfile');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.pharfile');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zipfile');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tarfile');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip2');
?>
--EXPECTF--
=================== new Phar() =======================
Expand Down
2 changes: 1 addition & 1 deletion ext/phar/tests/phar_convert_repeated_b.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ try {
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar.gz');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.zip');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.2.tar');
?>
--EXPECT--
=================== new PharData() ==================
Expand Down
5 changes: 2 additions & 3 deletions ext/phar/tests/stat2_5.3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ is_link();
var_dump(is_file(__FILE__));

$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar';
copy(dirname(__FILE__) . '/tar/files/links.tar', $fname2);
$a = new PharData($fname2);
$b = $a->convertToExecutable(Phar::TAR, Phar::NONE, '.3.phar.tar');
$b = $a->convertToExecutable(Phar::TAR, Phar::NONE);
unset($a);
Phar::unlinkArchive($fname2);
$b['foo/stat.php'] = '<?php
Expand All @@ -33,7 +32,7 @@ $b->addEmptyDir('foo/bar/blah');
$b->setStub('<?php
include "phar://" . __FILE__ . "/foo/stat.php";
__HALT_COMPILER();');
include $fname3;
include dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar';
?>
===DONE===
--CLEAN--
Expand Down