Avoid infinite loops with symlinks #2707
Closed
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
webknjaz
reviewed
Jun 23, 2021
Comment on lines
+250
to
+265
| # https://bugs.python.org/issue44497 | ||
| dirs = set() | ||
| files = set() | ||
| for dirpath, dirnames, filenames in os.walk(path, followlinks=True): | ||
| st = os.stat(dirpath) | ||
| scandirs = [] | ||
| for dirname in dirnames: | ||
| st = os.stat(os.path.join(dirpath, dirname)) | ||
| dirkey = st.st_dev, st.st_ino | ||
| if dirkey not in dirs: | ||
| dirs.add(dirkey) | ||
| scandirs.append(dirname) | ||
| dirnames[:] = scandirs | ||
| for f in filenames: | ||
| files.add(os.path.join(dirpath, f)) | ||
| return files |
There was a problem hiding this comment.
This should be submitted to https://github.com/pypa/distutils first.
webknjaz
reviewed
Jun 23, 2021
Comment on lines
+216
to
+231
| # https://bugs.python.org/issue44497 | ||
| dirs = set() | ||
| files = set() | ||
| for dirpath, dirnames, filenames in os.walk(path, followlinks=True): | ||
| st = os.stat(dirpath) | ||
| scandirs = [] | ||
| for dirname in dirnames: | ||
| st = os.stat(os.path.join(dirpath, dirname)) | ||
| dirkey = st.st_dev, st.st_ino | ||
| if dirkey not in dirs: | ||
| dirs.add(dirkey) | ||
| scandirs.append(dirname) | ||
| dirnames[:] = scandirs | ||
| for f in filenames: | ||
| files.add(os.path.join(dirpath, f)) | ||
| return files |
There was a problem hiding this comment.
Could you add a regression test for this change?
webknjaz
reviewed
Jun 23, 2021
|
As upstream pypa/distutils#44 is a very new project with a single maintainer and not really tested workflows (see its lack of CI jobs), I think we should aim to fix this here fist as it fixing a 6 years old bug which I consider critical, infinite loops. |
Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
|
See #2714, where I'm integrating the changes based on the report/PR in distutils. If these changes are needed for Setuptools separately from distutils (i.e. while Setuptools still falls back to stdlib distutils), let's use the implementation from distutils. |
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.
Fixes: #332
Summary of changes
Closes
Pull Request Checklist
changelog.d/.(See documentation for details)