fix bug #47085:rename() returns true even if the file in PHAR does not exist

diff --git a/NEWS b/NEWS
index d71cb9758d6f80b9de71a8c43c386142d8f048be..f11320e65a6061e6b337c7d404649ca130cc4a2d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? ??? 2009, PHP 5.3.0 Beta 2
 - Fixed bug #47265 (generating phar.phar failes because of safe_mode). (Greg)
 - Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno)
+- Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg)
 - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne)
 - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno)
 

diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index fa0049fbb06b7d9d1659a78953f30864fdb4e26c..bc38f5e75acc5d8502a9f1e7d82e50d968ffac59 100644 (file)
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -888,6 +888,14 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char
                is_dir = entry->is_dir;
        } else {
                is_dir = zend_hash_exists(&(phar->virtual_dirs), resource_from->path+1, strlen(resource_from->path)-1);
+               if (!is_dir) {
+                       /* file does not exist */
+                       php_url_free(resource_from);
+                       php_url_free(resource_to);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "phar error: cannot rename \"%s\" to \"%s\" from extracted phar archive, source does not exist", url_from, url_to);
+                       return 0;
+
+               }
        }
 
        /* Rename directory. Update all nested paths */

diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt
new file mode 100644 (file)
index 0000000..9aaaed0
--- /dev/null
+++ b/ext/phar/tests/bug47085.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Phar: PHP bug #47085: "rename() returns true even if the file in PHAR does not exist"
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
+
+$phar = new Phar($fname, 0, 'a.phar');
+$phar['x'] = 'hi';
+unset($phar);
+rename("phar://a.phar/x", "phar://a.phar/y");
+var_dump(rename("phar://a.phar/x", "phar://a.phar/y"));
+?>
+===DONE===
+--CLEAN--
+<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?>
+--EXPECTF--
+Warning: rename(): phar error: cannot rename "phar://a.phar/x" to "phar://a.phar/y" from extracted phar archive, source does not exist in %sbug47085.php on line %d
+bool(false)
+===DONE===
\ No newline at end of file