Merge pull request #4719 from owncloud/port_4701_master

Always check variable type before using readdir to avoid surprises

1 files changed, 61 insertions, 60 deletions

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index cd4db05fb9b..d40c5d1a977 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -329,72 +329,73 @@ class Util {
 			$this->view->is_dir($directory)
 			&& $handle = $this->view->opendir($directory)
 		) {
-
-			while (false !== ($file = readdir($handle))) {
-
-				if (
-					$file !== "."
-					&& $file !== ".."
-				) {
-
-					$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
-					$relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
-
-					// If the path is a directory, search
-					// its contents
-					if ($this->view->is_dir($filePath)) {
-
-						$this->findEncFiles($filePath, $found);
-
-						// If the path is a file, determine
-						// its encryption status
-					} elseif ($this->view->is_file($filePath)) {
-
-						// Disable proxies again, some-
-						// where they got re-enabled :/
-						\OC_FileProxy::$enabled = false;
-
-						$isEncryptedPath = $this->isEncryptedPath($filePath);
-						// If the file is encrypted
-						// NOTE: If the userId is
-						// empty or not set, file will
-						// detected as plain
-						// NOTE: This is inefficient;
-						// scanning every file like this
-						// will eat server resources :(
-						if (
-							Keymanager::getFileKey($this->view, $this->userId, $relPath)
-							&& $isEncryptedPath
-						) {
-
-							$found['encrypted'][] = array(
-								'name' => $file,
-								'path' => $filePath
-							);
-
-							// If the file uses old
-							// encryption system
-						} elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
-
-							$found['legacy'][] = array(
-								'name' => $file,
-								'path' => $filePath
-							);
-
-							// If the file is not encrypted
-						} else {
-
-							$found['plain'][] = array(
-								'name' => $file,
-								'path' => $relPath
-							);
+			if(is_resource($handle)) {
+				while (false !== ($file = readdir($handle))) {
+
+					if (
+						$file !== "."
+						&& $file !== ".."
+					) {
+
+						$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+						$relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
+
+						// If the path is a directory, search
+						// its contents
+						if ($this->view->is_dir($filePath)) {
+
+							$this->findEncFiles($filePath, $found);
+
+							// If the path is a file, determine
+							// its encryption status
+						} elseif ($this->view->is_file($filePath)) {
+
+							// Disable proxies again, some-
+							// where they got re-enabled :/
+							\OC_FileProxy::$enabled = false;
+
+							$isEncryptedPath = $this->isEncryptedPath($filePath);
+							// If the file is encrypted
+							// NOTE: If the userId is
+							// empty or not set, file will
+							// detected as plain
+							// NOTE: This is inefficient;
+							// scanning every file like this
+							// will eat server resources :(
+							if (
+								Keymanager::getFileKey($this->view, $this->userId, $relPath)
+								&& $isEncryptedPath
+							) {
+
+								$found['encrypted'][] = array(
+									'name' => $file,
+									'path' => $filePath
+								);
+
+								// If the file uses old
+								// encryption system
+							} elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
+
+								$found['legacy'][] = array(
+									'name' => $file,
+									'path' => $filePath
+								);
+
+								// If the file is not encrypted
+							} else {
+
+								$found['plain'][] = array(
+									'name' => $file,
+									'path' => $relPath
+								);
+
+							}
 
 						}
 
 					}
 
 				}
-
 			}
 
 			\OC_FileProxy::$enabled = true;