Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
4b40eeb3
Commit
4b40eeb3
authored
Feb 01, 2015
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
detect overflow in combinations (closes #23366)
parent
68389eaa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
+11
-0
Lib/test/test_itertools.py
Lib/test/test_itertools.py
+5
-0
Misc/NEWS
Misc/NEWS
+2
-0
Modules/itertoolsmodule.c
Modules/itertoolsmodule.c
+4
-0
No files found.
Lib/test/test_itertools.py
View file @
4b40eeb3
...
...
@@ -258,6 +258,11 @@ class TestBasicOps(unittest.TestCase):
self
.
pickletest
(
combinations
(
values
,
r
))
# test pickling
@
support
.
bigaddrspacetest
def
test_combinations_overflow
(
self
):
with
self
.
assertRaises
(
OverflowError
):
combinations
(
"AA"
,
2
**
29
)
# Test implementation detail: tuple re-use
@
support
.
impl_detail
(
"tuple reuse is specific to CPython"
)
def
test_combinations_tuple_reuse
(
self
):
...
...
Misc/NEWS
View file @
4b40eeb3
...
...
@@ -19,6 +19,8 @@ Library
- Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii.
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
What'
s
New
in
Python
3.3.6
?
===========================
...
...
Modules/itertoolsmodule.c
View file @
4b40eeb3
...
...
@@ -2326,6 +2326,10 @@ combinations_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
goto
error
;
}
if
(
r
>
PY_SSIZE_T_MAX
/
sizeof
(
Py_ssize_t
))
{
PyErr_SetString
(
PyExc_OverflowError
,
"r is too big"
);
goto
error
;
}
indices
=
PyMem_Malloc
(
r
*
sizeof
(
Py_ssize_t
));
if
(
indices
==
NULL
)
{
PyErr_NoMemory
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment