bpo-30614: testInitNonExistentFile() of test_bz2 leaks references #2033
Conversation
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
Extract the code of BZ2File_dealloc and create a new BZ2File_clear() function. Call BZ2File_clear() in BZ2File_dealloc(). Define BZ2File_clear() as tp_clear. Move the lock initialization before the "self->file = PyObject_CallFunction" in BZ2File_init() and check the lock is not created twice. Call BZ2File_clear() in BZ2File_init() after the init of the lock Co-Authored-By: Victor Stinner <victor.stinner@gmail.com>
vstinner
reviewed
Jun 9, 2017
Modules/bz2module.c
Outdated
| @@ -1420,6 +1444,18 @@ BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs) | |||
|
|
|||
| mode = (mode_char == 'r') ? "rb" : "wb"; | |||
|
|
|||
| #ifdef WITH_THREAD | |||
| if (!self->lock) | |||
There was a problem hiding this comment.
Please put the following code in the conditional if: { ... }
There was a problem hiding this comment.
By the way, you can add the following comment:
/* if init is called twice, keep the existing lock */
Fix after the review of Victor Stinner
|
Done, could you review it again ? thanks |
|
Thanks @matrixise for your fix ;-) |
|
Welcome ;-) |
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.
Extract the code of BZ2File_dealloc and create a new BZ2File_clear()
function. Call BZ2File_clear() in BZ2File_dealloc().
Define BZ2File_clear() as tp_clear.
Move the lock initialization before the "self->file =
PyObject_CallFunction" in BZ2File_init() and check the lock is not
created twice.
Call BZ2File_clear() in BZ2File_init() after the init of the lock
Co-Authored-By: Victor Stinner victor.stinner@gmail.com