GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-83004: Harden msvcrt init by erlend-aasland · Pull Request #103383 · python/cpython

Conversation

@erlend-aasland

@erlend-aasland erlend-aasland commented Apr 8, 2023 •
edited by bedevere-bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor
  • Issue: Improve stdlib module initialization error handling. #83004

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@erlend-aasland
pythongh-83004: Harden msvcrt init
18820c1
@erlend-aasland
erlend-aasland requested a review from a team as a code owner April 8, 2023 20:00
@erlend-aasland
erlend-aasland requested review from hauntsaninja and zooba April 8, 2023 20:00
@bedevere-bot bedevere-bot mentioned this pull request Apr 8, 2023
Improve stdlib module initialization error handling. #83004
Closed
@bedevere-bot bedevere-bot added the awaiting core review label Apr 8, 2023
@erlend-aasland erlend-aasland added the skip news label Apr 8, 2023
@erlend-aasland erlend-aasland mentioned this pull request Apr 8, 2023
gh-103092: Isolate msvcrt #103248
Merged
@erlend-aasland
Don't leak module object on error
528221f
@erlend-aasland
erlend-aasland marked this pull request as draft April 8, 2023 22:35
@erlend-aasland
Revert moving 'st'
ad93c2a
@erlend-aasland
erlend-aasland marked this pull request as ready for review April 8, 2023 23:03
kumaraditya303
kumaraditya303 approved these changes Apr 10, 2023
View reviewed changes
@bedevere-bot bedevere-bot added awaiting merge and removed awaiting core review labels Apr 10, 2023
@kumaraditya303
kumaraditya303 merged commit c3cd3d1 into python:main Apr 10, 2023
@bedevere-bot bedevere-bot removed the awaiting merge label Apr 10, 2023
@kumaraditya303
kumaraditya303 deleted the cleanup-msvcrt branch April 10, 2023 17:09
@erlend-aasland

erlend-aasland commented Apr 10, 2023 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor Author

Darn, I forgot to add error handling for PyDict_SetItemString. I'll create a follow-up PR for that: gh-103420

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

zooba
zooba reviewed Apr 11, 2023
View reviewed changes
Comment thread PC/msvcrtmodule.c
Comment on lines +673 to +676
if (version == NULL) {
goto error;
}
st = PyModule_AddObjectRef(m, "CRT_ASSEMBLY_VERSION", version);

@zooba zooba Apr 11, 2023

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

@erlend-aasland Just FYI, the modsupport functions allow passing in NULL provided an error has already occurred, and they just let it chain. So the code here was fine before.

No need to revert now though.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

@erlend-aasland erlend-aasland Apr 11, 2023

Copy link
Copy Markdown
Contributor Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

TIL! Sorry for not waiting on your review.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

@erlend-aasland erlend-aasland Apr 11, 2023

Copy link
Copy Markdown
Contributor Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

However, there was a leak if PyModule_AddObject failed, since that API only eat refs if successful.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions

@kumaraditya303 kumaraditya303 Apr 12, 2023

Copy link
Copy Markdown
Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

Sorry I should have been more careful in this.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
warsaw pushed a commit to warsaw/cpython that referenced this pull request Apr 11, 2023
@erlend-aasland @warsaw
pythongh-83004: Harden msvcrt init (python#103383)
1ce1aad
aisk pushed a commit to aisk/cpython that referenced this pull request Apr 18, 2023
@erlend-aasland @aisk
pythongh-83004: Harden msvcrt init (python#103383)
ce07012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zooba zooba zooba left review comments
@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes
@hauntsaninja hauntsaninja Awaiting requested review from hauntsaninja

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@erlend-aasland @zooba @kumaraditya303 @bedevere-bot
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.