diff options
| author | Victor Stinner <vstinner@python.org> | 2019-10-10 15:42:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 15:42:30 +0200 |
| commit | b6e0fc74265db96fdd0e0b8151c768c583ad80f0 (patch) | |
| tree | 005136ea916ab77f9a0d5d505b4879b63d62eff2 | |
| parent | d47f0dd2e85ce032aebfedbde18cdb2e728fa79f (diff) | |
| download | cpython-git-b6e0fc74265db96fdd0e0b8151c768c583ad80f0.tar.gz | |
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.
| -rw-r--r-- | Modules/getpath.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index 057a929019..8632d1fe6d 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: |