[Python-checkins] bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486)
miss-islington
webhook-mailer at python.org
Wed Jun 2 19:50:43 EDT 2021
https://github.com/python/cpython/commit/0e9af8cae314e4b0e770fe48d5f7b5f540c0b257
commit: 0e9af8cae314e4b0e770fe48d5f7b5f540c0b257
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-06-02T16:50:38-07:00
summary:
bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486)
This was flagged by a static analyzer, but the logic of why this is NULL on error is hard to follow for humans as well.
(cherry picked from commit bdb56902a3bfe12b10f85a941d5dd0eae739f1a8)
Co-authored-by: stratakis <cstratak at redhat.com>
files:
M Modules/getpath.c
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 44453f29df703a..363d62a0657ebd 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -1263,6 +1263,7 @@ calculate_read_pyenv(PyCalculatePath *calculate)
status = calculate_open_pyenv(calculate, &env_file);
if (_PyStatus_EXCEPTION(status)) {
+ assert(env_file == NULL);
return status;
}
if (env_file == NULL) {
More information about the Python-checkins
mailing list