From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 29 Aug 2018 11:45:34 +0000 (+0200)
Subject: bpo-34523: Fix config_init_fs_encoding() (GH-8991)
X-Git-Tag: v3.8.0a1~1133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70fead25e503a742ad4c919b151b9b2b5facee36;p=thirdparty%2FPython%2Fcpython.git

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

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
index 0ec4640336c7..625c743a419a 100644
--- 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;