From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 15 Mar 2019 15:03:23 +0000 (+0100)
Subject: bpo-36301: _PyCoreConfig_Read() ensures that argv is not empty (GH-12347)
X-Git-Tag: v3.8.0a3~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=625997622b4736e9184bdd8bf1e22a7b51be1afc;p=thirdparty%2FPython%2Fcpython.git

bpo-36301: _PyCoreConfig_Read() ensures that argv is not empty (GH-12347)

If argv is empty, add an empty string.
---

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 952bc327ddb3..374346e3cc89 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -292,7 +292,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
 
         'pycache_prefix': None,
         'program_name': './_testembed',
-        'argv': [],
+        'argv': [""],
         'program': None,
 
         'xoptions': [],
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index 15107fa36ce9..08273765098e 100644
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -1464,6 +1464,13 @@ _PyCoreConfig_Read(_PyCoreConfig *config, const _PyPreConfig *preconfig)
         return err;
     }
 
+    if (config->argv.length < 1) {
+        /* Ensure at least one (empty) argument is seen */
+        if (_PyWstrList_Append(&config->argv, L"") < 0) {
+            return _Py_INIT_NO_MEMORY();
+        }
+    }
+
     assert(config->preconfig.use_environment >= 0);
     assert(config->filesystem_encoding != NULL);
     assert(config->filesystem_errors != NULL);