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

miss-islington · stratakis · web-flow · commit 0e9af8cae314 · 2021-06-02T16:50:38.000-07:00
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 bdb5690) Co-authored-by: stratakis <cstratak@redhat.com>
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -1263,6 +1263,7 @@ calculate_read_pyenv(PyCalculatePath *calculate)`
`1263`	`1263`
`1264`	`1264`	`status = calculate_open_pyenv(calculate, &env_file);`
`1265`	`1265`	`if (_PyStatus_EXCEPTION(status)) {`
	`1266`	`+ assert(env_file == NULL);`
`1266`	`1267`	`return status;< 42EB /code>`
`1267`	`1268`	`}`
`1268`	`1269`	`if (env_file == NULL) {`