Skip to content

gh-116012: Preserve GetLastError() across calls to TlsGetValue on Windows #116014

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

Merged
merged 1 commit into from
Feb 28, 2024
Merged

gh-116012: Preserve GetLastError() across calls to TlsGetValue on Windows #116014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2024-02-27-23-21-55.gh-issue-116012.B9_IwM.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure the value of ``GetLastError()`` is preserved across GIL operations.
9 changes: 0 additions & 9 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2528,16 +2528,7 @@ PyGILState_Check(void)
return 0;
}

#ifdef MS_WINDOWS
int err = GetLastError();
#endif

PyThreadState *tcur = gilstate_tss_get(runtime);

#ifdef MS_WINDOWS
SetLastError(err);
#endif

return (tstate == tcur);
}

Expand Down
7 changes: 6 additions & 1 deletion Python/thread_nt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,5 +513,10 @@ void *
PyThread_tss_get(Py_tss_t *key)
{
assert(key != NULL);
return TlsGetValue(key->_key);
int err = GetLastError();
void *r = TlsGetValue(key->_key);
if (r || !GetLastError()) {
SetLastError(err);
}
return r;
}