[Pkg-owncloud-commits] [owncloud] 02/04: Also check if the source path is valid for rename and copy operations

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.11
in repository owncloud.

commit 6be497cb3f2ee28018d896d1a067e67ee841f752
Author: Robin Appelman <icewind at owncloud.com>
Date:   Sun Apr 28 19:19:08 2013 +0200

    Also check if the source path is valid for rename and copy operations
---
 lib/filesystemview.php |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index f21192f..2e11c73 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -326,7 +326,9 @@ class OC_FilesystemView {
 		$postFix2=(substr($path2,-1,1)==='/')?'/':'';
 		$absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1));
 		$absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2));
-		if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
+		if(OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2)
+				and OC_Filesystem::isValidPath($path1)
+				and OC_Filesystem::isValidPath($path2)) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
 
@@ -378,7 +380,9 @@ class OC_FilesystemView {
 		$postFix2=(substr($path2,-1,1)==='/')?'/':'';
 		$absolutePath1 = OC_Filesystem::normalizePath($this->getAbsolutePath($path1));
 		$absolutePath2 = OC_Filesystem::normalizePath($this->getAbsolutePath($path2));
-		if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and OC_Filesystem::isValidPath($path2)) {
+		if(OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2)
+				and OC_Filesystem::isValidPath($path1)
+				and OC_Filesystem::isValidPath($path2)) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git