From 18a0cdb2dc86452d8d75aac7e9bb610270979411 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Tue, 4 Oct 2022 11:57:06 -0700
Subject: [PATCH] [3.8] gh-96848: Fix -X int_max_str_digits option parsing
(GH-96988) (GH-97575)
Fix command line parsing: reject "-X int_max_str_digits" option with
no value (invalid) when the PYTHONINTMAXSTRDIGITS environment
variable is set to a valid limit.
(cherry picked from commit 41351662bcd21672d8ccfa62fe44d72027e6bcf8)
Co-authored-by: Victor Stinner <vstinner@python.org>
---
Lib/test/test_cmd_line.py | 2 ++
.../2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst | 3 +++
Python/initconfig.c | 3 ++-
3 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 9f09a501762..3e2f12a9d5f 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -794,6 +794,8 @@ def test_int_max_str_digits(self):
assert_python_failure('-X', 'int_max_str_digits', '-c', code)
assert_python_failure('-X', 'int_max_str_digits=foo', '-c', code)
assert_python_failure('-X', 'int_max_str_digits=100', '-c', code)
+ assert_python_failure('-X', 'int_max_str_digits', '-c', code,
+ PYTHONINTMAXSTRDIGITS='4000')
assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='foo')
assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='100')
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst b/Misc/NEWS.d/next/Core and Builtins/2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst
new file mode 100644
index 00000000000..a9b04ce87d4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst
@@ -0,0 +1,3 @@
+Fix command line parsing: reject :option:`-X int_max_str_digits <-X>` option
+with no value (invalid) when the :envvar:`PYTHONINTMAXSTRDIGITS` environment
+variable is set to a valid limit. Patch by Victor Stinner.
diff --git a/Python/initconfig.c b/Python/initconfig.c
index c2203c82367..003ac76c6e8 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -1403,10 +1403,10 @@ static PyStatus
config_init_int_max_str_digits(PyConfig *config)
{
int maxdigits;
- int valid = 0;
const char *env = config_get_env(config, "PYTHONINTMAXSTRDIGITS");
if (env) {
+ int valid = 0;
if (!_Py_str_to_int(env, &maxdigits)) {
valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));
}
@@ -1424,6 +1424,7 @@ config_init_int_max_str_digits(PyConfig *config)
const wchar_t *xoption = config_get_xoption(config, L"int_max_str_digits");
if (xoption) {
const wchar_t *sep = wcschr(xoption, L'=');
+ int valid = 0;
if (sep) {
if (!config_wstr_to_int(sep + 1, &maxdigits)) {
valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));
--
GitLab