gh-96848: Fix -X int_max_str_digits option parsing (#96988) · openSUSE-Python/cpython@4135166 · GitHub

openSUSE-Python / cpython Public

forked from python/cpython

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests 1
• Actions
• Security and quality
• Insights

Additional navigation options

Commit 4135166

Browse filesBrowse the repository at this point in the historyBrowse files

vstinner

authored

pythongh-96848: Fix -X int_max_str_digits option parsing (python#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.

1 parent 2b428a1 commit 4135166
Copy full SHA for 4135166

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
@@ -871,6 +871,8 @@ def test_int_max_str_digits(self):
871	871	assert_python_failure('-X', 'int_max_str_digits', '-c', code)
872	872	assert_python_failure('-X', 'int_max_str_digits=foo', '-c', code)
873	873	assert_python_failure('-X', 'int_max_str_digits=100', '-c', code)
	874	+ assert_python_failure('-X', 'int_max_str_digits', '-c', code,
	875	+ PYTHONINTMAXSTRDIGITS='4000')
874	876
875	877	assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='foo')
876	878	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
@@ -1779,10 +1779,10 @@ static PyStatus
1779	1779	config_init_int_max_str_digits(PyConfig *config)
1780	1780	{
1781	1781	int maxdigits;
1782		- int valid = 0;
1783	1782
1784	1783	const char *env = config_get_env(config, "PYTHONINTMAXSTRDIGITS");
1785	1784	if (env) {
	1785	+ int valid = 0;
1786	1786	if (!_Py_str_to_int(env, &maxdigits)) {
1787	1787	valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));
1788	1788	}
@@ -1800,6 +1800,7 @@ config_init_int_max_str_digits(PyConfig *config)
1800	1800	const wchar_t *xoption = config_get_xoption(config, L"int_max_str_digits");
1801	1801	if (xoption) {
1802	1802	const wchar_t *sep = wcschr(xoption, L'=');
	1803	+ int valid = 0;
1803	1804	if (sep) {
1804	1805	if (!config_wstr_to_int(sep + 1, &maxdigits)) {
1805	1806	valid = ((maxdigits == 0) || (maxdigits >= _PY_LONG_MAX_STR_DIGITS_THRESHOLD));

0 commit comments

Comments

0 (0)