Fix GH-9674: RecursiveDirectoryIterator regression wrt. junctions #9774
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If we `lstat()` a junction on Windows, it is not `S_ISLNK()`, but we still must not assume that it is not a link (in the broadest sense). In lack of a proper way to detect that, we use the fact that `.st_mode` is zero in this case.
cmb69
commented
Oct 18, 2022
| @@ -1480,7 +1480,7 @@ PHP_METHOD(RecursiveDirectoryIterator, hasChildren) | |||
| php_stat(intern->file_name, FS_LPERMS, return_value); | |||
| if (Z_TYPE_P(return_value) == IS_FALSE) { | |||
| return; | |||
| } else if (!S_ISLNK(Z_LVAL_P(return_value))) { | |||
| } else if (!S_ISLNK(Z_LVAL_P(return_value)) && Z_LVAL_P(return_value) != 0) { | |||
There was a problem hiding this comment.
We should at least add a comment, or better encapsulate the additional check in a macro/function (naming suggestions welcome!) However, I have doubts that it is even correct that lstat("junction")["mode"] == 0.
There was a problem hiding this comment.
Ping! I'd be really happy to get some input about naming the macro.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If we
lstat()a junction on Windows, it is notS_ISLNK(), but we still must not assume that it is not a link (in the broadest sense). In lack of a proper way to detect that, we use the fact that.st_modeis zero in this case.