Use better way to determine stream type in encryption stream wrapper

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · May 1, 2018 · 57ba18f · 57ba18f · MartB · Jul 27, 2018
1 parent c27016b
commit 57ba18f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php
@@ -195,10 +195,10 @@ public static function wrap($source, $internalPath, $fullPath, array $header,
 	protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') {
 		try {
 			stream_wrapper_register($protocol, $class);
-			if (@rewinddir($source) === false) {
-				$wrapped = fopen($protocol . '://', $mode, false, $context);
-			} else {
+			if (self::isDirectoryHandle($source)) {
 				$wrapped = opendir($protocol . '://', $context);
+			} else {
+				$wrapped = fopen($protocol . '://', $mode, false, $context);
 			}
 		} catch (\BadMethodCallException $e) {
 			stream_wrapper_unregister($protocol);