gh-96848: Fix -X int_max_str_digits option parsing (GH-96988) · python/cpython@a4ff0ea · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 74.9k

• Code
• Issues 5k+
• Pull requests 2.5k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a4ff0ea

Browse filesBrowse the repository at this point in the historyBrowse files

miss-islington

and

vstinner

authored

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 4135166) Co-authored-by: Victor Stinner <vstinner@python.org>

1 parent cf61fa2 commit a4ff0ea
Copy full SHA for a4ff0ea

3 files changed

+7-1Lines changed: 7 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test
  • test_cmd_line.py
• Misc/NEWS.d/next/Core and Builtins
  • 2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst
• Python
  • initconfig.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_cmd_line.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_cmd_line.py

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -874,6 +874,8 @@ def test_int_max_str_digits(self):
874	874	assert_python_failure('-X', 'int_max_str_digits', '-c', code)
875	875	assert_python_failure('-X', 'int_max_str_digits=foo', '-c', code)
876	876	assert_python_failure('-X', 'int_max_str_digits=100', '-c', code)
	877	+ assert_python_failure('-X', 'int_max_str_digits', '-c', code,
	878	+ PYTHONINTMAXSTRDIGITS='4000')
877	879
878	880	assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='foo')
879	881	assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='100')

Collapse file

‎Misc/NEWS.d/next/Core and Builtins/2022-09-21-14-38-31.gh-issue-96848.WuoLzU.rst‎

Copy file name to clipboard

+3Lines changed: 3 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,3 @@
	1	+ Fix command line parsing: reject :option:`-X int_max_str_digits <-X>` option
	2	+ with no value (invalid) when the :envvar:`PYTHONINTMAXSTRDIGITS` environment
	3	+ variable is set to a valid limit. Patch by Victor Stinner.

Collapse file

‎Python/initconfig.c‎

Copy file name to clipboardExpand all lines: Python/initconfig.c

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1734,10 +1734,10 @@ static PyStatus
1734	1734	config_init_int_max_str_digits(PyConfig *config)
1735	1735	{
1736	1736	int maxdigits;
1737		- int valid = 0;
1738	1737
1739	1738	const char *env = config_get_env(config, "PYTHONINTMAXSTRDIGITS");
1740	1739	if (env) {
	1740	+ int valid = 0;
1741	1741	if (!_Py_str_to_int(env, &maxdigits)) {
1742	1742	valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));
1743	1743	}
@@ -1755,6 +1755,7 @@ config_init_int_max_str_digits(PyConfig *config)
1755	1755	const wchar_t *xoption = config_get_xoption(config, L"int_max_str_digits");
1756	1756	if (xoption) {
1757	1757	const wchar_t *sep = wcschr(xoption, L'=');
	1758	+ int valid = 0;
1758	1759	if (sep) {
1759	1760	if (!config_wstr_to_int(sep + 1, &maxdigits)) {
1760	1761	valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));

0 commit comments

Comments

0 (0)