Visitar URL original
[3.7] gh-95778: CVE-2020-10735: Prevent DoS by very large int() by gpshead · Pull Request #96504 · python/cpython · GitHub
Skip to content

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

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
ned-deily merged 23 commits into from
Sep 6, 2022
Merged

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

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ca77774
Backport CVE-2020-10735 to 3.7 from 3.8.
gpshead Aug 30, 2022
f145128
Add What's New entry.
gpshead Aug 30, 2022
00a5114
Hack: Force CI run
tiran Sep 1, 2022
7eaad20
revert 1dae140b610a465b4d3e6fb2109ec13da6093e6d CI hack
gpshead Sep 1, 2022
635e292
Backport ctypes test_macholib fix from b29d0a5a7811418c0a1082ca188fd4…
gpshead Sep 1, 2022
a2956f3
annotate test_bad_password @requires_zlib.
gpshead Sep 1, 2022
95645b6
disable MachOTest.test_find unless macOS 11+ support is backported.
gpshead Sep 1, 2022
2cc321e
Move the whatsnew 3.7.14 text per review.
gpshead Sep 1, 2022
bc83515
LOL at my typo
gpshead Sep 1, 2022
76c9c2b
Make the doctest actually run & fix it.
gpshead Sep 1, 2022
e7bc47e
remove a line that prevents doctest error reporting.
gpshead Sep 2, 2022
0ef7ec0
Fix the docs build.
gpshead Sep 2, 2022
ad13c50
Update the ABI dump with the new private symbols.
gpshead Sep 2, 2022
2788f3f
Merge branch '3.7' into CVE-2020-10735-3.7backport
gpshead Sep 2, 2022
ca92fd2
Rename the news file to appease the Bedevere bot.
gpshead Sep 2, 2022
67905b2
Merge branch 'CVE-2020-10735-3.7backport' of github.com:gpshead/cpyth…
gpshead Sep 2, 2022
db48ddc
hexadecimal spelling =)
gpshead Sep 2, 2022
38ec6a9
Work around Windows Yield macro vs Python-ast.h
gpshead Sep 2, 2022
feaded8
doc typo: limitation
gpshead Sep 4, 2022
c9f2c57
Misc: Fix a typo in the header comment.
gpshead Sep 4, 2022
f69b587
remove unneeded doc note on float.as_integer_ratio
gpshead Sep 4, 2022
39837b6
gh-95778: Correctly pre-check for int-to-str conversion (#96537)
mdickinson Sep 4, 2022
7f911c1
backport cherry pick fix: lookup max from the right place.
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
Work around Windows Yield macro vs Python-ast.h
  • Loading branch information
@gpshead
gpshead committed Sep 2, 2022
commit 38ec6a9632db77af9867e41d6663f55cf0c44109
6 changes: 5 additions & 1 deletion Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
#include "ast.h"
#include "token.h"
#include "pythonrun.h"
/* A Windows header defines its own Yield macro, so we don't use the one
* from Python-ast.h and instead call _Py_Yield() directly. [ugh] */
#undef Yield
#include "internal/pystate.h"
Comment thread
gpshead marked this conversation as resolved.
#undef Yield

#include <assert.h>
#include <stdbool.h>
Expand Down Expand Up @@ -2703,7 +2707,7 @@ ast_for_expr(struct compiling *c, const node *n)
}
if (is_from)
return YieldFrom(exp, LINENO(n), n->n_col_offset, c->c_arena);
return Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
return _Py_Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
}
case factor:
if (NCH(n) == 1) {
Expand Down