aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJosh Richards <josh.t.richards@gmail.com>2023-06-03 08:57:38 -0400
committerSimon L <szaimen@e.mail.de>2023-06-24 15:37:06 +0200
commite7cbaf3ee323c9187356300012c8cfb3879b0349 (patch)
tree46422c9c829cb0ea5ed207e9b29587d278ace452 /lib
parent99cbf778f31a543889edcc709dbc9e8c9361e5f5 (diff)
downloadnextcloud-server-e7cbaf3ee323c9187356300012c8cfb3879b0349.tar.gz
nextcloud-server-e7cbaf3ee323c9187356300012c8cfb3879b0349.zip
Clean-up some remaining readdir calls with undesirable false evaluation potential
Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Common.php2
-rw-r--r--lib/private/Files/Storage/PolyFill/CopyDirectory.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 5ab411434d0..15fe788a821 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -228,7 +228,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
$this->remove($target);
$dir = $this->opendir($source);
$this->mkdir($target);
- while ($file = readdir($dir)) {
+ while (($file = readdir($dir)) !== false) {
if (!Filesystem::isIgnoredDir($file)) {
if (!$this->copy($source . '/' . $file, $target . '/' . $file)) {
closedir($dir);
diff --git a/lib/private/Files/Storage/PolyFill/CopyDirectory.php b/lib/private/Files/Storage/PolyFill/CopyDirectory.php
index ff05eecb134..c22b9edc592 100644
--- a/lib/private/Files/Storage/PolyFill/CopyDirectory.php
+++ b/lib/private/Files/Storage/PolyFill/CopyDirectory.php
@@ -86,7 +86,7 @@ trait CopyDirectory {
protected function copyRecursive($source, $target) {
$dh = $this->opendir($source);
$result = true;
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if ($this->is_dir($source . '/' . $file)) {
$this->mkdir($target . '/' . $file);