diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-09-26 15:43:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 15:43:26 (GMT) |
| commit | a4ff0eaaf07364e45967ca96ccd6416c2aa2fd22 (patch) | |
| tree | 1e4911c7e28fa5b6a9052f9f728608f673e0d01e /Python/initconfig.c | |
| parent | cf61fa278e0a19a4aa5cb7cbd5c98ff2a84d481d (diff) | |
| download | cpython-a4ff0eaaf07364e45967ca96ccd6416c2aa2fd22.zip cpython-a4ff0eaaf07364e45967ca96ccd6416c2aa2fd22.tar.gz cpython-a4ff0eaaf07364e45967ca96ccd6416c2aa2fd22.tar.bz2 | |
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 41351662bcd21672d8ccfa62fe44d72027e6bcf8)
Co-authored-by: Victor Stinner <vstinner@python.org>
Diffstat (limited to 'Python/initconfig.c')
| -rw-r--r-- | Python/initconfig.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/initconfig.c b/Python/initconfig.c index 0ce22e0..0ccca26 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -1734,10 +1734,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)); } @@ -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"); 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)); |