-
-
Notifications
You must be signed in to change notification settings - Fork 33.9k
gh-142781: Fix type confusion in zoneinfo weak cache #142925
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.
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
Open
superboy-zjc
wants to merge
6
commits into
python:main
Choose a base branch
from
superboy-zjc:issue-142781
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+49
−0
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
bf06241
gh-142781: Fix type confusion in zoneinfo weak cache
superboy-zjc 1c01521
gh-142781: address review comments by refactoring TypeError message, …
superboy-zjc 812e54e
gh-142781: fix NEWS Lint issue
superboy-zjc baa1405
Merge branch 'main' of https://github.com/python/cpython into issue-1…
superboy-zjc 6a34091
gh-142781: cut off unnecessary comments and refactor the logical branch
superboy-zjc 110351a
Update Modules/_zoneinfo.c
superboy-zjc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
2 changes: 2 additions & 0 deletions
2
Misc/NEWS.d/next/Library/2025-12-18-00-14-16.gh-issue-142781.gcOeYF.rst
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| :mod:`zoneinfo`: fix a crash when instantiating :class:`~zoneinfo.ZoneInfo` | ||
| objects for which the internal class-level cache is inconsistent. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -342,8 +342,24 @@ zoneinfo_ZoneInfo_impl(PyTypeObject *type, PyObject *key) | |
| Py_DECREF(weak_cache); | ||
| return NULL; | ||
| } | ||
|
|
||
| if (!PyObject_TypeCheck(instance, type)) { | ||
| PyErr_Format(PyExc_TypeError, "expected %s, got %s", | ||
| type->tp_name, Py_TYPE(instance)->tp_name); | ||
| Py_DECREF(instance); | ||
| Py_DECREF(weak_cache); | ||
| return NULL; | ||
| } | ||
|
|
||
| ((PyZoneInfo_ZoneInfo *)instance)->source = SOURCE_CACHE; | ||
| } | ||
| else if (!PyObject_TypeCheck(instance, type)) { | ||
| PyErr_Format(PyExc_TypeError, "expected %s, got %s", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This error message is rather confusing. "Expected" means that you passed argument of wrong type. I would write something like "Unexpected instance of %T in %T weak cache for key %R". And we can use RuntimeError here, to accent that this is an unexpected error. |
||
| type->tp_name, Py_TYPE(instance)->tp_name); | ||
| Py_DECREF(instance); | ||
| Py_DECREF(weak_cache); | ||
| return NULL; | ||
| } | ||
|
|
||
| update_strong_cache(state, type, key, instance); | ||
| Py_DECREF(weak_cache); | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Objects in the weak cache should have source = SOURCE_CACHE. We only need to set it for new objects. So, I think that we should move this line up and set source for tmp instead of instance.
Then we could deduplicate the check and error formatting code.