Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-97758: Fix a crash in getpath_joinpath() called without arguments #97759

Merged
merged 1 commit into from
Oct 5, 2022
Merged

gh-97758: Fix a crash in getpath_joinpath() called without arguments #97759

merged 1 commit into from
Oct 5, 2022

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Oct 3, 2022 •
edited by bedevere-bot
Loading

@serhiy-storchaka serhiy-storchaka added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Oct 3, 2022
@serhiy-storchaka
Copy link
Member Author

Maybe raising a TypeError would be more appropriate. In getpath.py the function is always called with 2 arguments.

vstinner
vstinner approved these changes Oct 3, 2022
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM.

Oops, as I wrote in the PR adding this code, it would be nice to write unit tests, but this code is not accessible in Python, nor in C outside this C file. Maybe we could add a _getpath extension module and test it in test_getpath.py.

@vstinner
Copy link
Member

vstinner commented Oct 3, 2022

Oops, as I wrote in the PR adding this code

Ah I thought that I introduced this code, but it was already there before. Good that you catched the issue ;-)

@serhiy-storchaka serhiy-storchaka merged commit f8cbd79 into python:main Oct 5, 2022
@miss-islington
Copy link
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the getpath-joinpath-no-args branch October 5, 2022 09:52
@miss-islington
Copy link
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker f8cbd79d328d90443acabc41d246332c302c815a 3.10

@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Oct 5, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 5, 2022
@serhiy-storchaka @miss-islington
pythongh-97758: Fix a crash in getpath_joinpath() called without argu…
024bc08 
…ments (pythonGH-97759)

(cherry picked from commit f8cbd79)

Co-authored-by: Serhiy Storchaka <[email protected]>
@serhiy-storchaka serhiy-storchaka removed their assignment Oct 5, 2022
@serhiy-storchaka serhiy-storchaka removed the needs backport to 3.10 only security fixes label Oct 5, 2022
miss-islington added a commit that referenced this pull request Oct 5, 2022
@miss-islington @serhiy-storchaka
gh-97758: Fix a crash in getpath_joinpath() called without arguments (G…
73e3510 
…H-97759)

(cherry picked from commit f8cbd79)

Co-authored-by: Serhiy Storchaka <[email protected]>
carljm added a commit to carljm/cpython that referenced this pull request Oct 6, 2022
@carljm
Merge branch 'main' into dictwatch
4bb5d9d 
* main: (66 commits)
  pythongh-65961: Raise `DeprecationWarning` when `__package__` differs from `__spec__.parent` (python#97879)
  docs(typing): add "see PEP 675" to LiteralString (python#97926)
  pythongh-97850: Remove all known instances of module_repr() (python#97876)
  I changed my surname early this year (python#96671)
  pythongh-93738: Documentation C syntax (:c:type:<C type> -> :c:expr:<C type>) (python#97768)
  pythongh-91539: improve performance of get_proxies_environment  (python#91566)
  build(deps): bump actions/stale from 5 to 6 (python#97701)
  pythonGH-95172 Make the same version `versionadded` oneline (python#95172)
  pythongh-88050: Fix asyncio subprocess to kill process cleanly when process is blocked (python#32073)
  pythongh-93738: Documentation C syntax (Function glob patterns -> literal markup) (python#97774)
  pythongh-93357: Port test cases to IsolatedAsyncioTestCase, part 2 (python#97896)
  pythongh-95196: Disable incorrect pickling of the C implemented classmethod descriptors (pythonGH-96383)
  pythongh-97758: Fix a crash in getpath_joinpath() called without arguments (pythonGH-97759)
  pythongh-74696: Pass root_dir to custom archivers which support it (pythonGH-94251)
  pythongh-97661: Improve accuracy of sqlite3.Cursor.fetchone docs (python#97662)
  pythongh-87092: bring compiler code closer to a preprocessing-opt-assembler organisation (pythonGH-97644)
  pythonGH-96704: Add {Task,Handle}.get_context(), use it in call_exception_handler() (python#96756)
  pythongh-93738: Documentation C syntax (:c:type:`PyTypeObject*` -> :c:expr:`PyTypeObject*`) (python#97778)
  pythongh-97825: fix AttributeError when calling subprocess.check_output(input=None) with encoding or errors args (python#97826)
  Add re.VERBOSE flag documentation example (python#97678)
  ...
mpage pushed a commit to mpage/cpython that referenced this pull request Oct 11, 2022
@serhiy-storchaka @mpage
pythongh-97758: Fix a crash in getpath_joinpath() called without argu…
18523e0 
…ments (pythonGH-97759)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@serhiy-storchaka @vstinner @miss-islington @bedevere-bot