FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-106242: Fix path truncation in normpath by finnagin · Pull Request #106816 · python/cpython · GitHub

/ cpython Public

gh-106242: Fix path truncation in normpath - #106816

Merged
zooba merged 27 commits into
python:mainfrom
finnagin:106242
Aug 15, 2023
ConversationCommits (27)ChecksFiles changed
Merged

gh-106242: Fix path truncation in normpath#106816
zooba merged 27 commits into
python:mainfrom
finnagin:106242

Conversation

finnagin commented Jul 17, 2023 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

Following the suggestion from this comment in the original issue this PR adds a new function _Py_normpathAndSize which behaves like _Py_normpath but also takes a pointer which it will use to store the length of the final normalized path. This new function is then used in os__path_normpath_impl to pass the above mentioned length into PyUnicode_FromWideChar instead of -1.

Additionally, this adds a test to check that normpath is not truncating paths containing a null character as well as changes test_addpackage_import_bad_pth_file in test_site.py which was using a null character to make a bad path, specifically it was using the string 'abc\x00def'. The problem is that before this change this was being truncated for parts of the test so the string it was actually using in those parts was 'abc'. Upon making the normpath changes it started throwing the error ValueError: embedded null character so I changed the test to use 'abc<>$$**:://def' instead.

finnagin and others added 22 commits July 3, 2023 12:38
added _Py_normpathAndSize
d1fe8fa
Merge remote-tracking branch 'upstream/main' into 106242
726da04
PyAPI_FUNC -> extern
8cab42c
remove prinfs
82a9d36
fix length calculation
6c18bf8
length -> norm_size, fix begining null char case
c90249d
fix norm_size calculation
8e1f1ea
add test cases
3003891
Merge remote-tracking branch 'upstream/main' into 106242
2fcae77
move tests to test_genericpath.py
30fa3a4
handle edge cases
f0afe44
decrement p2 when == minp2 & update minp2 handling with leading ./
6412901
change test case to no longer include null character
78192de
Merge remote-tracking branch 'upstream/main' into 106242
199abac
Merge branch 'python:main' into 106242
cbe57c4
Add norm_size variable description, add normpath description
4b9de2c
update normpathAndSize description
f1731f1
norm_size->normsize
d7f7045
Merge remote-tracking branch 'upstream/main' into 106242
184fde9
remove trailing whitespace
9e0d52a
Merge remote-tracking branch 'upstream/main' into 106242
3815967
Merge branch 'python:main' into 106242
d9d78cc
bedevere-bot mentioned this pull request Jul 17, 2023
Closed
AlexWaygood requested review from eryksun and zooba July 17, 2023 00:04
zooba reviewed Jul 17, 2023
View reviewed changes

zooba left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM with the minor name convention update

Comment thread Include/internal/pycore_fileutils.h Outdated
Comment thread Include/internal/pycore_fileutils.h Outdated
eryksun reviewed Jul 17, 2023
View reviewed changes
Comment thread Lib/test/test_site.py Outdated
finnagin mentioned this pull request Jul 17, 2023
Closed

zooba commented Aug 14, 2023

Copy link
Copy Markdown
Member

Looks like we just need the NEWS entry - click "Details" next to the failed check for info on it (or run PCbuild/blurb.bat to create it locally).

Text should be something like ``Fixes :func:os.normpath to handle embedded null characters without truncating the path.` and put it under Library.

Update Misc/NEWS.d/next/Library/2023-08-14-23-11-11.gh-issue-106242.7…
aecae84 
…1HMym.rst

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
zooba merged commit 0932272 into python:main Aug 15, 2023
zooba added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Aug 15, 2023

miss-islington commented Aug 15, 2023

Copy link
Copy Markdown
Contributor

Thanks @finnagin for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

miss-islington commented Aug 15, 2023

Copy link
Copy Markdown
Contributor

Thanks @finnagin for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

miss-islington commented Aug 15, 2023

Copy link
Copy Markdown
Contributor

Sorry, @finnagin and @zooba, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 09322724319d4c23195300b222a1c0ea720af56b 3.11

miss-islington commented Aug 15, 2023

Copy link
Copy Markdown
Contributor

Sorry, @finnagin and @zooba, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 09322724319d4c23195300b222a1c0ea720af56b 3.12

bedevere-bot commented Aug 15, 2023

Copy link
Copy Markdown

GH-107981 is a backport of this pull request to the 3.12 branch.

bedevere-bot removed the needs backport to 3.12 only security fixes label Aug 15, 2023

bedevere-bot commented Aug 15, 2023

Copy link
Copy Markdown

GH-107982 is a backport of this pull request to the 3.11 branch.

bedevere-bot removed the needs backport to 3.11 only security fixes label Aug 15, 2023
zooba pushed a commit to zooba/cpython that referenced this pull request Aug 15, 2023
pythongh-106242: Fix path truncation in os.path.normpath (pythonGH-10…
828d1ef 
…6816)
zooba pushed a commit to zooba/cpython that referenced this pull request Aug 15, 2023
pythongh-106242: Fix path truncation in os.path.normpath (pythonGH-10…
ae5e111 
…6816)
ambv pushed a commit that referenced this pull request Aug 15, 2023
[3.11] gh-106242: Fix path truncation in os.path.normpath (GH-106816) (…
ccf81e1 
…#107982)

Co-authored-by: Finn Womack <flan313@gmail.com>
iritkatriel pushed a commit to iritkatriel/cpython that referenced this pull request Aug 16, 2023
pythongh-106242: Fix path truncation in os.path.normpath (pythonGH-10…
3a22494 
…6816)
Yhg1s pushed a commit that referenced this pull request Aug 16, 2023
[3.12] gh-106242: Fix path truncation in os.path.normpath (GH-106816) (…
ede9895 
…#107981)

* gh-106242: Fix path truncation in os.path.normpath (GH-106816)
* gh-106242: Minor fixup to avoid compiler warnings

---------

Co-authored-by: Finn Womack <flan313@gmail.com>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
vstinner mentioned this pull request Nov 3, 2023
Closed
This file contains hidden or 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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

eryksun eryksun left review comments
zooba zooba approved these changes

Assignees

zooba

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

Back | FazBrowse Home | New Git URL