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
37434323
Commit
37434323
authored
Jan 26, 2016
by
Raymond Hettinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26194: Fix undefined behavior for deque.insert() when len(d) == maxlen
parent
d4e51f45
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
0 deletions
+28
-0
Doc/library/collections.rst
Doc/library/collections.rst
+3
-0
Lib/test/test_deque.py
Lib/test/test_deque.py
+14
-0
Misc/NEWS
Misc/NEWS
+4
-0
Modules/_collectionsmodule.c
Modules/_collectionsmodule.c
+7
-0
No files found.
Doc/library/collections.rst
View file @
37434323
...
...
@@ -477,6 +477,9 @@ or subtracting from an empty counter.
Insert *x* into the deque at position *i*.
If the insertion causes a bounded deque to grow beyond *maxlen*, the
rightmost element is then removed to restore the size limit.
.. versionadded:: 3.5
...
...
Lib/test/test_deque.py
View file @
37434323
...
...
@@ -304,6 +304,20 @@ class TestBasic(unittest.TestCase):
s
.
insert
(
i
,
'Z'
)
self
.
assertEqual
(
list
(
d
),
s
)
def
test_index_bug_26194
(
self
):
data
=
'ABC'
for
i
in
range
(
len
(
data
)
+
1
):
d
=
deque
(
data
,
len
(
data
))
d
.
insert
(
i
,
None
)
s
=
list
(
data
)
s
.
insert
(
i
,
None
)
s
.
pop
()
self
.
assertEqual
(
list
(
d
),
s
)
if
i
<
len
(
data
):
self
.
assertIsNone
(
d
[
i
])
else
:
self
.
assertTrue
(
None
not
in
d
)
def
test_imul
(
self
):
for
n
in
(
-
10
,
-
1
,
0
,
1
,
2
,
10
,
1000
):
d
=
deque
()
...
...
Misc/NEWS
View file @
37434323
...
...
@@ -17,6 +17,10 @@ Core and Builtins
Python
3.5.1
to
hide
the
exact
implementation
of
atomic
C
types
,
to
avoid
compiler
issues
.
-
Issue
#
26194
:
Deque
.
insert
()
gave
odd
results
for
bounded
deques
that
had
reached
their
maximum
size
.
Now
,
the
insert
will
happen
normally
and
then
any
overflowing
element
will
be
truncated
from
the
right
side
.
-
Issue
#
25843
:
When
compiling
code
,
don
't merge constants if they are equal
but have a different types. For example, ``f1, f2 = lambda: 1, lambda: 1.0``
is now correctly compiled to two different functions: ``f1()`` returns ``1``
...
...
Modules/_collectionsmodule.c
View file @
37434323
...
...
@@ -973,10 +973,17 @@ deque_insert(dequeobject *deque, PyObject *args)
Py_ssize_t
index
;
Py_ssize_t
n
=
Py_SIZE
(
deque
);
PyObject
*
value
;
PyObject
*
oldvalue
;
PyObject
*
rv
;
if
(
!
PyArg_ParseTuple
(
args
,
"nO:insert"
,
&
index
,
&
value
))
return
NULL
;
if
(
deque
->
maxlen
==
Py_SIZE
(
deque
))
{
if
(
index
>=
deque
->
maxlen
||
Py_SIZE
(
deque
)
==
0
)
Py_RETURN_NONE
;
oldvalue
=
deque_pop
(
deque
,
NULL
);
Py_DECREF
(
oldvalue
);
}
if
(
index
>=
n
)
return
deque_append
(
deque
,
value
);
if
(
index
<=
-
n
||
index
==
0
)
...
...
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