[3.13] gh-77894: Fix a crash when the GC breaks a loop containing a memoryview (GH-123898) #123936
+57
−33
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
…moryview (pythonGH-123898) Now a memoryview object can only be cleared if there are no buffers that refer it. (cherry picked from commit a1dbf2e) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This was referenced Sep 11, 2024
rruuaanng
reviewed
Sep 15, 2024
| return 0; | ||
| self->flags |= _Py_MEMORYVIEW_RELEASED; | ||
| assert(self->mbuf->exports > 0); | ||
| if (--self->mbuf->exports == 0) { |
There was a problem hiding this comment.
Maybe changing if (--self->mbuf->exports == 0) to
self->mbuf->exports -= 1; // or self->mbuf->exports--;
if (self->mbuf->exports == 0)
...
will be more readable, that my idea.
There was a problem hiding this comment.
I personally think that --self->mbuf->exports is a bit confusing.
There was a problem hiding this comment.
This was in the old code.
If you want to change this code, create a PR for the main branch. The backported code should not differ from the original code without good reasons.
serhiy-storchaka
approved these changes
Sep 24, 2024
| return 0; | ||
| self->flags |= _Py_MEMORYVIEW_RELEASED; | ||
| assert(self->mbuf->exports > 0); | ||
| if (--self->mbuf->exports == 0) { |
There was a problem hiding this comment.
This was in the old code.
If you want to change this code, create a PR for the main branch. The backported code should not differ from the original code without good reasons.
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.
Now a memoryview object can only be cleared if there are no buffers
that refer it.
(cherry picked from commit a1dbf2e)
Co-authored-by: Serhiy Storchaka storchaka@gmail.com