Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix remaining readdir() calls in loops with undesirable false evaluation potential#38630

Merged
skjnldsv merged 2 commits intonextcloud:masterfrom
joshtrichards:jr-readdir-false-false
Aug 16, 2024
Merged

Fix remaining readdir() calls in loops with undesirable false evaluation potential#38630
skjnldsv merged 2 commits intonextcloud:masterfrom
joshtrichards:jr-readdir-false-false

Conversation

@joshtrichards
Copy link
Member

@joshtrichards joshtrichards commented Jun 3, 2023 •
edited by solracsf
Loading

Summary

Fixes all remaining readdir() calls within loops that had undesirable false evaluation potential (at least in server)

There weren't too many left and the bulk were in tests. The most notable not in tests were these:

  • copy() in \OC\Files\Storage\Common
  • isEmpty() in OCA\Files_Trashbin\Trashbin
  • copyRecursive() in OC\Files\Storage\PolyFill\CopyDirectory

Ref: https://www.php.net/manual/en/function.readdir.php

TODO

  • ...

Checklist

solracsf
solracsf approved these changes Jun 3, 2023
View reviewed changes
Copy link
Member

@solracsf solracsf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, avoid "falsy" and ensure "false". 🆗

@solracsf solracsf added the 3. to review Waiting for reviews label Jun 3, 2023
@solracsf solracsf added this to the Nextcloud 28 milestone Jun 3, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Jun 3, 2023
View reviewed changes
apps/files_external/lib/Lib/Storage/Swift.php

$dh = $this->opendir($path);
while ($file = readdir($dh)) {
while (($file = readdir($dh)) !== false) {

Check notice

Code scanning / Psalm

PossiblyFalseArgument

Argument 1 of readdir cannot be false, possibly resource value expected
apps/files_external/lib/Lib/Storage/Swift.php

$dh = $this->opendir($source);
while ($file = readdir($dh)) {
while (($file = readdir($dh)) !== false) {

Check notice

Code scanning / Psalm

PossiblyFalseArgument

Argument 1 of readdir cannot be false, possibly resource value expected
@solracsf
Copy link
Member

solracsf commented Jun 3, 2023 •
edited
Loading

I wonder if these Psaml warnings worth something like:

// Open the directory and obtain a resource handle
$dh = opendir($directory);

// Check if the directory was opened successfully
if (is_resource($dh)) {
    // Iterate through directory entries
    while (($file = readdir($dh)) !== false) {
        // Process each file or directory
    }

    // Close the directory handle
    closedir($dh);
}

🤔

@szaimen szaimen requested review from a team, ArtificialOwl, blizzz and icewind1991 and removed request for a team June 3, 2023 14:32
@joshtrichards joshtrichards mentioned this pull request Jun 3, 2023
Merged
@joshtrichards joshtrichards force-pushed the jr-readdir-false-false branch from ac5dfeb to 84cc3a2 Compare June 6, 2023 21:53
@joshtrichards
Copy link
Member Author

joshtrichards commented Jun 16, 2023

I don't think any of these test fails are related to this PR. 😕

@szaimen szaimen force-pushed the jr-readdir-false-false branch from 84cc3a2 to e7cbaf3 Compare June 24, 2023 13:37
@blizzz
Copy link
Member

blizzz commented Jul 10, 2023

The psalm warnings are likely not new, but silenced before. opendir may return false, which is not what readdir likes.

@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
Merged
This was referenced Nov 6, 2023
Merged
Merged
This was referenced Nov 14, 2023
Merged
Merged
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
This was referenced Mar 12, 2024
Merged
Merged
Merged
This was referenced Mar 20, 2024
Merged
Merged
@skjnldsv skjnldsv mentioned this pull request Mar 28, 2024
Merged
81 tasks
@skjnldsv skjnldsv removed this from the Nextcloud 29 milestone Mar 28, 2024
This was referenced Jul 30, 2024
Merged
Merged
This was referenced Aug 5, 2024
Merged
Merged
@skjnldsv skjnldsv mentioned this pull request Aug 13, 2024
Merged
@skjnldsv skjnldsv closed this Aug 14, 2024
@skjnldsv skjnldsv removed this from the Nextcloud 30 milestone Aug 14, 2024
@skjnldsv skjnldsv reopened this Aug 16, 2024
@skjnldsv
Copy link
Member

skjnldsv commented Aug 16, 2024

Rebased! Let's hope it works this time !! 💪

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish technical debt and removed 2. developing Work in progress stale Ticket or PR with no recent activity labels Aug 16, 2024
@skjnldsv skjnldsv self-assigned this Aug 16, 2024
@skjnldsv
Copy link
Member

skjnldsv commented Aug 16, 2024

🎉 🎉 🎉

@skjnldsv skjnldsv merged commit d94073d into nextcloud:master Aug 16, 2024
@skjnldsv skjnldsv added this to the Nextcloud 31 milestone Aug 16, 2024
@yemkareems
Copy link
Contributor

yemkareems commented Nov 12, 2024

/backport to stable29

@yemkareems
Copy link
Contributor

yemkareems commented Nov 12, 2024

/backport to stable28

@backportbot backportbot bot mentioned this pull request Nov 12, 2024
Merged
2 tasks
@backportbot backportbot bot mentioned this pull request Nov 12, 2024
Merged
2 tasks
@yemkareems
Copy link
Contributor

yemkareems commented Nov 13, 2024

/backport to stable30

@backportbot backportbot bot mentioned this pull request Nov 13, 2024
Merged
2 tasks
@skjnldsv skjnldsv mentioned this pull request Jan 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@solracsf solracsf solracsf approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl ArtificialOwl is a code owner automatically assigned from nextcloud/server-backend

@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 is a code owner automatically assigned from nextcloud/server-backend

@blizzz blizzz Awaiting requested review from blizzz blizzz is a code owner automatically assigned from nextcloud/server-backend

Assignees

@skjnldsv skjnldsv

Labels

4. to release Ready to be released and/or waiting for tests to finish technical debt

Projects

None yet

Milestone

Nextcloud 31

Development

Successfully merging this pull request may close these issues.

5 participants

@joshtrichards @solracsf @blizzz @skjnldsv @yemkareems