bpo-32030: Fix config_get_program_name() on macOS (#4669)

vstinner · web-flow · commit e23c06e2b034 · 2017-12-01T21:19:48.000+01:00
diff --git a/Modules/main.c b/Modules/main.c
@@ -894,7 +894,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)
             return SET_DECODE_ERROR("PYTHONEXECUTABLE environment "
                                     "variable", len);
         }
-        pymain->config.program_name = buffer;
+        config->program_name = program_name;
     }
 #ifdef WITH_NEXT_FRAMEWORK
     else {
@@ -909,7 +909,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)
                 return SET_DECODE_ERROR("__PYVENV_LAUNCHER__ environment "
                                         "variable", len);
             }
-            pymain->config.program_name = program_name;
+            config->program_name = program_name;
         }
     }
 #endif   /* WITH_NEXT_FRAMEWORK */

Original file line number	Diff line number	Diff line change
`@@ -894,7 +894,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)`
`894`	`894`	`return SET_DECODE_ERROR("PYTHONEXECUTABLE environment "`
`895`	`895`	`"variable", len);`
`896`	`896`	`}`
`897`		`- pymain->config.program_name = buffer;`
	`897`	`+ config->program_name = program_name;`
`898`	`898`	`}`
`899`	`899`	`#ifdef WITH_NEXT_FRAMEWORK`
`900`	`900`	`else {`
`@@ -909,7 +909,7 @@ config_get_program_name(_PyMainInterpreterConfig *config)`
`909`	`909`	`return SET_DECODE_ERROR("__PYVENV_LAUNCHER__ environment "`
`910`	`910`	`"variable", len);`
`911`	`911`	`}`
`912`		`- pymain->config.program_name = program_name;`
	`912`	`+ config->program_name = program_name;`
`913`	`913`	`}`
`914`	`914`	`}`
`915`	`915`	`#endif /* WITH_NEXT_FRAMEWORK */`