10000 bpo-40737: Fix possible reference leak for sqlite3 initialization by erlend-aasland · Pull Request #20323 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-40737: Fix possible reference leak for sqlite3 initialization #20323

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
Merged
merged 15 commits into from
May 26, 2020
Merged

bpo-40737: Fix possible reference leak for sqlite3 initialization #20323

merged 15 commits into from
May 26, 2020

Conversation

erlend-aasland
Copy link
Contributor
@erlend-aasland erlend-aasland commented May 22, 2020 •
edited by bedevere-bot
Loading

According to the docs, PyModule_AddObject() only decrements the
reference count of value on success. Calling code must Py_DECREF()
manually on error.

https://bugs.python.org/issue40737

Use PyModule_AddObject() correctly in sqlite3
fc20024 
According to the docs, PyModule_AddObject() only decrements the
reference count of value _on success_.  Calling code must Py_DECREF()
manually on error.
corona10
corona10 approved these changes May 25, 2020
View reviewed changes
Copy link
Member
@corona10 corona10 left a comment

Choose a reason for hiding this comment

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

lgtm with nit comment.

corona10
corona10 requested changes May 25, 2020
View reviewed changes
@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

Erlend Egeberg Aasland and others added 9 commits May 25, 2020 17:44
@corona10
Update Misc/NEWS.d/next/Library/2020-05-23-00-22-11.bpo-40737.iph-CM.rst
df83c42 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@corona10
Update Modules/_sqlite/module.c
1b5def8 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@corona10
Update Modules/_sqlite/module.c
9e954fb 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@corona10
Update Modules/_sqlite/module.c
59f6cfb 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@corona10
Update Modules/_sqlite/module.c
1ea05c9 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@corona10
Update Modules/_sqlite/module.c
37403bc 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
Use PyModule_AddType iso. PyModule_AddObject
8d6e116
Fix dot in Node name
01e89c4
Set up _all_ types
40bab48
@erlend-aasland erlend-aasland changed the title bpo-40737: Use PyModule_AddObject() correctly in sqlite3 bpo-40737: Use PyModule_AddType() in sqlite3 May 25, 2020
@erlend-aasland erlend-aasland changed the title bpo-40737: Use PyModule_AddType() in sqlite3 bpo-40737: Fix possible reference leak for sqlite3 initialization May 25, 2020
@erlend-aasland
Copy link
Contributor Author

I have made the requested changes; please review again.

@bedevere-bot
Copy link

Thanks for making the requested changes!

@corona10: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from corona10 May 25, 2020 18:23
@erlend-aasland
Copy link
Contributor Author

Should probably be backported to 3.9, @corona10.

corona10
corona10 requested changes May 26, 2020
View reviewed changes
@bedevere-bot
Copy link

Thanks for making the requested changes!

@corona10: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from corona10 May 26, 2020 08:21
corona10
corona10 requested changes May 26, 2020
View reviewed changes
Copy link
Member
@corona10 corona10 left a comment

Choose a reason for hiding this comment

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

Last review :)
It will cause the leak!

cpython/Python/modsupport.c

Line 693 in a487a39

Py_INCREF(type);

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@corona10
Update Modules/_sqlite/module.c
841eab6 
Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@erlend-aasland
Copy link
Contributor Author

I have made the requested changes; please review again

@bedevere-bot
Copy link

Thanks for making the requested changes!

@corona10: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from corona10 May 26, 2020 08:29
corona10
corona10 approved these changes May 26, 2020
View reviewed changes
Copy link 6D40
Member
@corona10 corona10 left a comment

Choose a reason for hiding this comment

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

lgtm! Thanks for the contribution!

@corona10 corona10 added the needs backport to 3.9 only security fixes label May 26, 2020
@corona10 corona10 merged commit 5eb45d7 into python:master May 26, 2020
@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR, and @corona10 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 26, 2020
@miss-islington
bpo-40737: Fix possible reference leak for sqlite3 initialization (py…
511f7f5 
…thonGH-20323)

(cherry picked from commit 5eb45d7)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label May 26, 2020
@bedevere-bot
Copy link

GH-20425 is a backport of this pull request to the 3.9 branch.

@erlend-aasland erlend-aasland deleted the fix-issue-40737 branch May 26, 2020 12:32
miss-islington added a commit that referenced this pull request May 26, 2020
@miss-islington
bpo-40737: Fix possible reference leak for sqlite3 initialization (GH…
7df9c41 
…-20323)

(cherry picked from commit 5eb45d7)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@erlend-aasland
Copy link
Contributor Author

Thanks for you patience and helpful comments, @corona10!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corona10 corona10 corona10 approved these changes

@berkerpeksag berkerpeksag Awaiting requested review from berkerpeksag

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

Successfully merging this pull request may close these issues.
5 participants
@erlend-aasland @bedevere-bot @miss-islington @corona10 @the-knights-who-say-ni
0