Skip to content

[3.7] bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded (GH-21297) #21298

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

Merged
merged 2 commits into from
Jul 6, 2020

Conversation

zooba
Copy link
Member

@zooba zooba commented Jul 3, 2020

@zooba zooba requested a review from a team as a code owner July 3, 2020 19:54
@zooba zooba changed the title [3.7] bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded [3.7] bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded (GH-21297) Jul 3, 2020
@bedevere-bot bedevere-bot added type-bug An unexpected behavior, bug, or error type-security A security issue labels Jul 3, 2020
@zooba
Copy link
Member Author

zooba commented Jul 3, 2020

@ned-deily FYI, but do not merge yet, thanks!

@zooba
Copy link
Member Author

zooba commented Jul 6, 2020

@ned-deily Okay, you may merge when ready.

@ned-deily ned-deily merged commit 110dd15 into python:3.7 Jul 6, 2020
@bedevere-bot
Copy link

@ned-deily: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington
Copy link
Contributor

Thanks @zooba for the PR, and @ned-deily for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @zooba and @ned-deily, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 110dd153662a13b8ae1bb06348e5b1f118ab26d7 3.6

@zooba zooba deleted the bpo29778-3.7 branch July 6, 2020 18:04
@zooba zooba assigned zooba and unassigned ned-deily Jul 6, 2020
@zooba zooba removed the DO-NOT-MERGE label Jul 6, 2020
zooba added a commit to zooba/cpython that referenced this pull request Jul 6, 2020
…ython is embedded (pythonGH-21298)

* bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded.

* Add CVE number
@bedevere-bot
Copy link

GH-21354 is a backport of this pull request to the 3.6 branch.

ned-deily pushed a commit that referenced this pull request Jul 6, 2020
…when Python is embedded (GH-21298) (#21354)

* bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded (GH-21298)

* bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded.

* Add CVE number

* Updates for 3.6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type-bug An unexpected behavior, bug, or error type-security A security issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants