diff options
| author | Gregory P. Smith <gps@google.com> | 2022-09-02 16:51:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-02 16:51:49 (GMT) |
| commit | 8f0fa4bd10aba723aff988720cd26b93be99bc12 (patch) | |
| tree | 533e993997f3f0135df42dfca9796996361ca504 /Lib/idlelib | |
| parent | bbcb03e7b07ecf6f3ed0c308f72bc10f928c85a8 (diff) | |
| download | cpython-8f0fa4bd10aba723aff988720cd26b93be99bc12.zip cpython-8f0fa4bd10aba723aff988720cd26b93be99bc12.tar.gz cpython-8f0fa4bd10aba723aff988720cd26b93be99bc12.tar.bz2 | |
[3.10] gh-95778: CVE-2020-10735: Prevent DoS by very large int() (#96501)
Integer to and from text conversions via CPython's bignum `int` type is not safe against denial of service attacks due to malicious input. Very large input strings with hundred thousands of digits can consume several CPU seconds.
This PR comes fresh from a pile of work done in our private PSRT security response team repo.
This backports https://github.com/python/cpython/pull/96499 aka 511ca9452033ef95bc7d7fc404b8161068226002
Signed-off-by: Christian Heimes [Red Hat] <christian@python.org>
Tons-of-polishing-up-by: Gregory P. Smith [Google] <greg@krypto.org>
Reviews via the private PSRT repo via many others (see the NEWS entry in the PR).
<!-- gh-issue-number: gh-95778 -->
* Issue: gh-95778
<!-- /gh-issue-number -->
I wrote up [a one pager for the release managers](https://docs.google.com/document/d/1KjuF_aXlzPUxTK4BMgezGJ2Pn7uevfX7g0_mvgHlL7Y/edit#).
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/idle_test/test_sidebar.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/idlelib/idle_test/test_sidebar.py b/Lib/idlelib/idle_test/test_sidebar.py index 290e037..049531e 100644 --- a/Lib/idlelib/idle_test/test_sidebar.py +++ b/Lib/idlelib/idle_test/test_sidebar.py @@ -6,6 +6,7 @@ from itertools import chain import unittest import unittest.mock from test.support import requires, swap_attr +from test import support import tkinter as tk from idlelib.idle_test.tkinter_testing_utils import run_in_tk_mainloop @@ -612,7 +613,8 @@ class ShellSidebarTest(unittest.TestCase): @run_in_tk_mainloop() def test_very_long_wrapped_line(self): - with swap_attr(self.shell, 'squeezer', None): + with support.adjust_int_max_str_digits(11_111), \ + swap_attr(self.shell, 'squeezer', None): self.do_input('x = ' + '1'*10_000 + '\n') yield self.assertEqual(self.get_sidebar_lines(), ['>>>']) |