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.

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

[3.7] gh-80254: Disallow recursive usage of cursors in sqlite3 converters #92334

Merged

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented May 5, 2022

(cherry picked from commit c908dc5)

Co-authored-by: Sergey Fedoseev fedoseev.sergey@gmail.com
Co-authored-by: Jelle Zijlstra jelle.zijlstra@gmail.com

erlend-aasland and others added 3 commits May 5, 2022
…` converters

(cherry picked from commit c908dc5)

Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@erlend-aasland erlend-aasland added 🔨 test-with-buildbots and removed awaiting review labels May 5, 2022
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented May 5, 2022

🤖 New build scheduled with the buildbot fleet by @erlend-aasland for commit d52fd31 🤖

If you want to schedule another build, you need to add the "🔨 test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots label May 5, 2022
@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 5, 2022

CI cannot find merge base, and decides that this is not worthy running the tests. Buildbots seem to ignore this fact though, so I guess that it's fine if they are green.

UPDATE: a little bit too fast there; AMD64 FreeBSD Non-Debug is green, but it did not run. It failed before even compiling.

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 5, 2022

This buildbot run does not look good. Do you experience this often on the 3.7 branch, @ambv?

Copy link
Member

@JelleZijlstra JelleZijlstra left a comment

We're not allowed to merge until regular CI passes (the check is required). Code looks good to me but we'll have to figure out what's up with CI.

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 5, 2022

I think it is related to 4ac923f

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 5, 2022

See also GH-21806

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 5, 2022

I think backporting both GH-24004 and GH-21806 will fix it. Maybe not both are required, but I think both should be backported.

@JelleZijlstra
Copy link
Member

@JelleZijlstra JelleZijlstra commented May 5, 2022

I think backporting both GH-24004 and GH-21806 will fix it. Maybe not both are required, but I think both should be backported.

Seems reasonable. I triggered #92341 and #92342, but I am not authorized to merge to the 3.7 branch.

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented May 5, 2022

Great! I'll pull in 3.7 when the backports land.

@vstinner
Copy link
Member

@vstinner vstinner commented May 5, 2022

The 3.7 branch no longer accept bugfixes, only security fixes: https://devguide.python.org/#status-of-python-branches

Do you consider that this change fix a security issue?

@ned-deily
Copy link
Member

@ned-deily ned-deily commented May 6, 2022

Do you consider that this change fix a security issue?

Yes, see discussion here.

@ned-deily ned-deily merged commit 2a353b2 into python:3.7 May 23, 2022
10 checks passed
@erlend-aasland erlend-aasland deleted the backport-sqlite-converter-segfault-3.7 branch May 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants