bpo-34523: Fix config_init_fs_encoding() (pythonGH-8991)

vstinner · web-flow · commit 70fead25e503 · 2018-08-29T13:45:34.000+02:00
Call config_init_fs_encoding() if filesystem_errors is not NULL but
filesystem_encoding is NULL.
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
@@ -1344,7 +1344,7 @@ _PyCoreConfig_Read(_PyCoreConfig *config)
         config->argc = 0;
     }
 
-    if (config->filesystem_encoding == NULL && config->filesystem_errors == NULL) {
+    if (config->filesystem_encoding == NULL || config->filesystem_errors == NULL) {
         err = config_init_fs_encoding(config);
         if (_Py_INIT_FAILED(err)) {
             return err;

Original file line number	Diff line number	Diff line change
`@@ -1344,7 +1344,7 @@ _PyCoreConfig_Read(_PyCoreConfig *config)`
`1344`	`1344`	`config->argc = 0;`
`1345`	`1345`	`}`
`1346`	`1346`
`1347`		`- if (config->filesystem_encoding == NULL && config->filesystem_errors == NULL) {`
	`1347`	`+ if (config->filesystem_encoding == NULL \|\| config->filesystem_errors == NULL) {`
`1348`	`1348`	`err = config_init_fs_encoding(config);`
`1349`	`1349`	`if (_Py_INIT_FAILED(err)) {`
`1350`	`1350`	`return err;`