Skip to content

[3.12] gh-105375: Improve posix error handling (GH-105592) #105598

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
erlend-aasland merged 1 commit into from
Jun 11, 2023
+10 −4
Merged

[3.12] gh-105375: Improve posix error handling (GH-105592) #105598

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
gh-105375: Improve posix error handling (GH-105592) 
Fix a bug where an IndexError could end up being overwritten.
(cherry picked from commit f668f73)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
  • Loading branch information
@erlend-aasland @miss-islington
erlend-aasland authored and miss-islington committed Jun 9, 2023
commit e607c6b11339c208cf088347e96fb4d0107dcaca
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-06-09-21-30-59.gh-issue-105375.eewafp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a bug in the :mod:`posix` module where an exception could be
overwritten.
12 changes: 8 additions & 4 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6414,7 +6414,7 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
{
Py_ssize_t i, pos, envc;
PyObject *keys=NULL, *vals=NULL;
PyObject *key, *val, *key2, *val2, *keyval;
PyObject *key2, *val2, *keyval;
EXECV_CHAR **envlist;

i = PyMapping_Size(env);
Expand All @@ -6439,10 +6439,14 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
}

for (pos = 0; pos < i; pos++) {
key = PyList_GetItem(keys, pos);
val = PyList_GetItem(vals, pos);
if (!key || !val)
PyObject *key = PyList_GetItem(keys, pos); // Borrowed ref.
if (key == NULL) {
goto error;
}
PyObject *val = PyList_GetItem(vals, pos); // Borrowed ref.
if (val == NULL) {
goto error;
}

#if defined(HAVE_WEXECV) || defined(HAVE_WSPAWNV)
if (!PyUnicode_FSDecoder(key, &key2))
Expand Down