add test for pre-existing alias failure, fix source to fail if alias already exists

diff --git a/ext/phar/package.xml b/ext/phar/package.xml
index 1b459f334f905aa1b8494f3d0a280b215725257f..e015a443fdf74a7a1c0a741e7f970fc21b69656d 100644 (file)
--- a/ext/phar/package.xml
+++ b/ext/phar/package.xml
@@ -155,6 +155,7 @@ avaiable then SHA-256 and SHA-512 signatures are supported as well.</description
     <file name="phar_oo_test.inc" role="test" />
     <file name="phar_oo_uncompressall.phpt" role="test" />
     <file name="phar_setalias.phpt" role="test" />
+    <file name="phar_setalias2.phpt" role="test" />
     <file name="phar_setsignaturealgo1.phpt" role="test" />
     <file name="phar_setsignaturealgo2.phpt" role="test" />
     <file name="phar_stub.phpt" role="test" />

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 85375441c07495a87e0f09d1c788bb79eff98a92..124c471a872a83c18286e891a867bacebbf2481d 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -310,6 +310,15 @@ PHP_METHOD(Phar, setAlias)
        int alias_len;
        PHAR_ARCHIVE_OBJECT();
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &alias, &alias_len) == SUCCESS) {
+               if (alias_len == phar_obj->arc.archive->alias_len && memcmp(phar_obj->arc.archive->alias, alias, alias_len) == 0) {
+                       RETURN_TRUE;
+               }
+               if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void**)&fd_ptr)) {
+                       spprintf(&error, 0, "alias \"%s\" is already used for archive \"%s\" and cannot be used for other archives", alias, (*fd_ptr)->fname);
+                       zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error);
+                       efree(error);
+                       RETURN_FALSE;
+               }
                if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), phar_obj->arc.archive->alias, phar_obj->arc.archive->alias_len, (void**)&fd_ptr)) {
                        zend_hash_del(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len);
                        fd = *fd_ptr;

diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt
new file mode 100644 (file)
index 0000000..2a41744
--- /dev/null
+++ b/ext/phar/tests/phar_setalias2.phpt
@@ -0,0 +1,43 @@
+--TEST--
+Phar::setAlias() error
+--SKIPIF--
+<?php if (!extension_loaded("phar")) print "skip"; ?>
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
+$pname = 'phar://' . $fname;
+$file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>';
+
+$files = array();
+$files['a'] = 'a';
+$files['b'] = 'b';
+$files['c'] = 'c';
+
+include 'phar_test.inc';
+
+$phar = new Phar($fname);
+echo $phar->getAlias() . "\n";
+$phar->setAlias('test');
+echo $phar->getAlias() . "\n";
+$phar = new Phar(dirname(__FILE__) . '/notphar.phar');
+try {
+       $phar->setAlias('test');
+} catch (Exception $e) {
+       echo $e->getMessage() . "\n";
+}
+?>
+===DONE===
+--CLEAN--
+<?php 
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
+__HALT_COMPILER();
+?>
+--EXPECTF--
+hio
+test
+alias "test" is already used for archive "%sphar_setalias2.phar.php" and cannot be used for other archives
+===DONE===