[Python-checkins] [3.11] Correct CVE-2020-10735 documentation (GH-100306). (#100476)
gpshead
webhook-mailer at python.org
Fri Dec 23 21:07:57 EST 2022
https://github.com/python/cpython/commit/a852c5f8ee19f996335841a78b73549d7d4117c4
commit: a852c5f8ee19f996335841a78b73549d7d4117c4
branch: 3.11
author: Gregory P. Smith <greg at krypto.org>
committer: gpshead <greg at krypto.org>
date: 2022-12-23T18:07:50-08:00
summary:
[3.11] Correct CVE-2020-10735 documentation (GH-100306). (#100476)
(cherry picked from commit 1cf3d78c92eb07dc09d15cc2e773b0b1b9436825)
Co-authored-by: Jeremy Paige <ucodery at gmail.com>
files:
M Doc/library/stdtypes.rst
M Python/clinic/sysmodule.c.h
M Python/sysmodule.c
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index a1514f611d4f..2bc86e978387 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -5476,7 +5476,7 @@ to mitigate denial of service attacks. This limit *only* applies to decimal or
other non-power-of-two number bases. Hexadecimal, octal, and binary conversions
are unlimited. The limit can be configured.
-The :class:`int` type in CPython is an abitrary length number stored in binary
+The :class:`int` type in CPython is an arbitrary length number stored in binary
form (commonly known as a "bignum"). There exists no algorithm that can convert
a string to a binary integer or a binary integer to a string in linear time,
*unless* the base is a power of 2. Even the best known algorithms for base 10
@@ -5540,7 +5540,7 @@ and :class:`str` or :class:`bytes`:
* ``int(string)`` with default base 10.
* ``int(string, base)`` for all bases that are not a power of 2.
* ``str(integer)``.
-* ``repr(integer)``
+* ``repr(integer)``.
* any other string conversion to base 10, for example ``f"{integer}"``,
``"{}".format(integer)``, or ``b"%d" % integer``.
@@ -5568,7 +5568,7 @@ command line flag to configure the limit:
:envvar:`PYTHONINTMAXSTRDIGITS` or :option:`-X int_max_str_digits <-X>`.
If both the env var and the ``-X`` option are set, the ``-X`` option takes
precedence. A value of *-1* indicates that both were unset, thus a value of
- :data:`sys.int_info.default_max_str_digits` was used during initilization.
+ :data:`sys.int_info.default_max_str_digits` was used during initialization.
From code, you can inspect the current limit and set a new one using these
:mod:`sys` APIs:
diff --git a/Python/clinic/sysmodule.c.h b/Python/clinic/sysmodule.c.h
index b3ecab59a733..8ca3cd086059 100644
--- a/Python/clinic/sysmodule.c.h
+++ b/Python/clinic/sysmodule.c.h
@@ -673,7 +673,7 @@ PyDoc_STRVAR(sys_get_int_max_str_digits__doc__,
"get_int_max_str_digits($module, /)\n"
"--\n"
"\n"
-"Set the maximum string digits limit for non-binary int<->str conversions.");
+"Return the maximum string digits limit for non-binary int<->str conversions.");
#define SYS_GET_INT_MAX_STR_DIGITS_METHODDEF \
{"get_int_max_str_digits", (PyCFunction)sys_get_int_max_str_digits, METH_NOARGS, sys_get_int_max_str_digits__doc__},
@@ -1067,4 +1067,4 @@ sys_getandroidapilevel(PyObject *module, PyObject *Py_UNUSED(ignored))
#ifndef SYS_GETANDROIDAPILEVEL_METHODDEF
#define SYS_GETANDROIDAPILEVEL_METHODDEF
#endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */
-/*[clinic end generated code: output=21a32aa71d36a98c input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3cae0e0212d88bcd input=a9049054013a1b77]*/
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 0ecfd77ba14c..68a835a30baa 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1627,12 +1627,12 @@ sys_mdebug_impl(PyObject *module, int flag)
/*[clinic input]
sys.get_int_max_str_digits
-Set the maximum string digits limit for non-binary int<->str conversions.
+Return the maximum string digits limit for non-binary int<->str conversions.
[clinic start generated code]*/
static PyObject *
sys_get_int_max_str_digits_impl(PyObject *module)
-/*[clinic end generated code: output=0042f5e8ae0e8631 input=8dab13e2023e60d5]*/
+/*[clinic end generated code: output=0042f5e8ae0e8631 input=61bf9f99bc8b112d]*/
{
PyInterpreterState *interp = _PyInterpreterState_GET();
return PyLong_FromSsize_t(interp->int_max_str_digits);
More information about the Python-checkins
mailing list