bpo-38353: Fix typos in calculate_argv0_path_framework() (GH-16695)

vstinner · web-flow · commit b6e0fc74265d · 2019-10-10T15:42:30.000+02:00
bpo-38353, bpo-38429: Fix typos introduced by commit c02b41b in calculate_argv0_path_framework() of getpath.c.
diff --git 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:
