[Python-checkins] bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486) (GH-26496)

vstinner webhook-mailer at python.org
Wed Jun 2 19:50:59 EDT 2021


https://github.com/python/cpython/commit/85b587a38dcf5d0ef1e275510001e22425d65977
commit: 85b587a38dcf5d0ef1e275510001e22425d65977
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vstinner <vstinner at python.org>
date: 2021-06-03T01:50:55+02:00
summary:

bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486) (GH-26496)

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 40358190a71b87..728ecad052e142 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