[Python-checkins] bpo-38353: Fix typos in calculate_argv0_path_framework() (GH-16695)

Thu Oct 10 09:42:36 EDT 2019

https://github.com/python/cpython/commit/b6e0fc74265db96fdd0e0b8151c768c583ad80f0
commit: b6e0fc74265db96fdd0e0b8151c768c583ad80f0
branch: master
author: Victor Stinner <vstinner at python.org>
committer: GitHub <noreply at github.com>
date: 2019年10月10日T15:42:30+02:00
summary:
bpo-38353: Fix typos in calculate_argv0_path_framework() (GH-16695)
bpo-38353, bpo-38429: Fix typos introduced by commit
c02b41b1fb115c87693530ea6a480b2e15460424 in
calculate_argv0_path_framework() of getpath.c.
files:
M Modules/getpath.c

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 057a929019755..8632d1fe6d80f 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -1126,7 +1126,7 @@ calculate_argv0_path_framework(PyCalculatePath *calculate, _PyPathConfig *pathco
 }
 
 reduce(parent);
- wchar_t *lib_python = joinpath2(path, calculate->lib_python);
+ wchar_t *lib_python = joinpath2(parent, calculate->lib_python);
 PyMem_RawFree(parent);
 
 if (lib_python == NULL) {
@@ -1144,7 +1144,7 @@ calculate_argv0_path_framework(PyCalculatePath *calculate, _PyPathConfig *pathco
 if (!module) {
 /* We are in the build directory so use the name of the
 executable - we know that the absolute path is passed */
- PyMem_RawFree(*calculate->argv0_path);
+ PyMem_RawFree(calculate->argv0_path);
 calculate->argv0_path = _PyMem_RawWcsdup(pathconfig->program_full_path);
 if (calculate->argv0_path == NULL) {
 status = _PyStatus_NO_MEMORY();
@@ -1156,8 +1156,8 @@ calculate_argv0_path_framework(PyCalculatePath *calculate, _PyPathConfig *pathco
 }
 
 /* Use the location of the library as argv0_path */
- PyMem_RawFree(*calculate->argv0_path);
- calculate->argv0_path = wbuf
+ PyMem_RawFree(calculate->argv0_path);
+ calculate->argv0_path = wbuf;
 return _PyStatus_OK();
 
 done:
