mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-96848: Fix -X int_max_str_digits option parsing (GH-96988) 

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 41351662bc)

Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
Miss Islington (bot) 2022-09-26 08:43:26 -07:00 committed by Pablo Galindo
parent 9e008fe351
commit 67f5d24e44
No known key found for this signature in database
GPG Key ID: FFE87404168BD847
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_cmd_line.py
View File

@ -874,6 +874,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', '-c', code)
assert_python_failure('-X', 'int_max_str_digits=foo', '-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=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='foo')
assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='100') assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='100')

3
Misc/NEWS.d/next/Core and Builtins/2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst Normal file
View File

@ -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.

3
Python/initconfig.c
View File

@ -1734,10 +1734,10 @@ static PyStatus
config_init_int_max_str_digits(PyConfig *config) config_init_int_max_str_digits(PyConfig *config)
{ {
int maxdigits; int maxdigits;
int valid = 0;
const char *env = config_get_env(config, "PYTHONINTMAXSTRDIGITS"); const char *env = config_get_env(config, "PYTHONINTMAXSTRDIGITS");
if (env) { if (env) {
int valid = 0;
if (!_Py_str_to_int(env, &maxdigits)) { if (!_Py_str_to_int(env, &maxdigits)) {
valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD)); valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));
} }
@ -1755,6 +1755,7 @@ config_init_int_max_str_digits(PyConfig *config)
const wchar_t *xoption = config_get_xoption(config, L"int_max_str_digits"); const wchar_t *xoption = config_get_xoption(config, L"int_max_str_digits");
if (xoption) { if (xoption) {
const wchar_t *sep = wcschr(xoption, L'='); const wchar_t *sep = wcschr(xoption, L'=');
int valid = 0;
if (sep) { if (sep) {
if (!config_wstr_to_int(sep + 1, &maxdigits)) { if (!config_wstr_to_int(sep + 1, &maxdigits)) {
valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD)); valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));