Skip to content

[3.8] gh-95778: CVE-2020-10735: Prevent DoS by very large int() #96503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambv merged 17 commits into from
Sep 5, 2022
Merged

[3.8] gh-95778: CVE-2020-10735: Prevent DoS by very large int() #96503

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b518238
Backport to 3.8 of psrt/CVE-2020-10735-3.10backport.
gpshead Aug 19, 2022
504e82f
Fix the versionchanged/addeds to 3.8.14.
gpshead Aug 30, 2022
cae5eba
add the attribution to the NEWS entry.
gpshead Aug 30, 2022
cd54fc3
Backport the Parser/pegen.c change for a good SyntaxError to ast.c.
gpshead Aug 30, 2022
eb68f9c
Add Whats New entry.
gpshead Aug 30, 2022
75bbbbf
Manually add new field to abi file
tiran Sep 1, 2022
14467fc
Move the whatsnew text per review.
gpshead Sep 1, 2022
1e39232
Merge branch 'CVE-2020-10735-3.8backport' of github.com:python/psrt i…
gpshead Sep 1, 2022
70b9aef
Make the doctest actually run & fix it.
gpshead Sep 1, 2022
7eb255f
Fix the docs build.
gpshead Sep 2, 2022
0504ecb
Rename the news file to appease the Bedevere bot.
gpshead Sep 2, 2022
8acc891
hexadecimal spelling =)
gpshead Sep 2, 2022
52f2c26
doc typo: limitation
gpshead Sep 4, 2022
510349b
Misc: Fix a typo in the header comment.
gpshead Sep 4, 2022
ac99726
remove unneeded doc note on float.as_integer_ratio
gpshead Sep 4, 2022
17bd053
gh-95778: Correctly pre-check for int-to-str conversion (#96537)
mdickinson Sep 4, 2022
c9212d5
Use the 3.8 Get API for it to compile.
gpshead Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Backport the Parser/pegen.c change for a good SyntaxError to ast.c. 
Fixes test_ast and test_compile.
  • Loading branch information
@gpshead
gpshead committed Aug 30, 2022
commit cd54fc39876a1de6853a8cf436b4b5ae6778f5a3
19 changes: 18 additions & 1 deletion Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2460,8 +2460,25 @@ ast_for_atom(struct compiling *c, const node *n)
return NULL;
}
pynum = parsenumber(c, STR(ch));
if (!pynum)
if (!pynum) {
PyThreadState *tstate = PyThreadState_GET();
// The only way a ValueError should happen in _this_ code is via
// PyLong_FromString hitting a length limit.
if (tstate->curexc_type == PyExc_ValueError &&
tstate->curexc_value != NULL) {
PyObject *type, *value, *tb;
// This acts as PyErr_Clear() as we're replacing curexc.
PyErr_Fetch(&type, &value, &tb);
Py_XDECREF(tb);
Py_DECREF(type);
ast_error(c, ch,
"%S - Consider hexidecimal for huge integer literals "
"to avoid decimal conversion limits.",
value);
Py_DECREF(value);
}
return NULL;
}

if (PyArena_AddPyObject(c->c_arena, pynum) < 0) {
Py_DECREF(pynum);
Expand Down