diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-12 15:44:20 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-12 15:44:20 -0700 |
| commit | d5ddbfb04562ba69a94d05413b931a4b378f0220 (patch) | |
| tree | 7c73eb0ce8e4f61be5a8361a0c93abb16fadea9c /lib/files/view.php | |
| parent | c7ca86799b2608609ead7ecd2d84d0bbd47c6548 (diff) | |
| parent | c01675de5d6650c7b1cd0571d8c313f21d13c33c (diff) | |
| download | nextcloud-server-d5ddbfb04562ba69a94d05413b931a4b378f0220.tar.gz nextcloud-server-d5ddbfb04562ba69a94d05413b931a4b378f0220.zip | |
Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
Diffstat (limited to 'lib/files/view.php')
| -rw-r--r-- | lib/files/view.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/files/view.php b/lib/files/view.php index 98a04486690..6d58bcd9918 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -500,9 +500,11 @@ class View { } else { if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) { $result = $this->mkdir($path2); - while (($file = readdir($dh)) !== false) { - if (!Filesystem::isIgnoredDir($file)) { - $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if (!Filesystem::isIgnoredDir($file)) { + $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file); + } } } } else { |