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
7e4f3215
Commit
7e4f3215
authored
Jul 05, 2009
by
Alexandre Vassalotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 4509: Do not modify an array if we know the change would result
in a failure due to exported buffers.
parent
200cfd00
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
0 deletions
+24
-0
Lib/test/test_array.py
Lib/test/test_array.py
+16
-0
Modules/arraymodule.c
Modules/arraymodule.c
+8
-0
No files found.
Lib/test/test_array.py
View file @
7e4f3215
...
...
@@ -749,9 +749,25 @@ class BaseTest(unittest.TestCase):
ArraySubclassWithKwargs
(
'b'
,
newarg
=
1
)
def
test_create_from_bytes
(
self
):
# XXX This test probably needs to be moved in a subclass or
# generalized to use self.typecode.
a
=
array
.
array
(
'H'
,
b"1234"
)
self
.
assertEqual
(
len
(
a
)
*
a
.
itemsize
,
4
)
def
test_memoryview_no_resize
(
self
):
# Test for issue 4509.
a
=
array
.
array
(
self
.
typecode
,
self
.
example
)
m
=
memoryview
(
a
)
expected
=
m
.
tobytes
()
self
.
assertRaises
(
BufferError
,
a
.
pop
,
0
)
self
.
assertEqual
(
m
.
tobytes
(),
expected
)
self
.
assertRaises
(
BufferError
,
a
.
remove
,
a
[
0
])
self
.
assertEqual
(
m
.
tobytes
(),
expected
)
self
.
assertRaises
(
BufferError
,
a
.
__setitem__
,
slice
(
0
,
0
),
a
)
self
.
assertEqual
(
m
.
tobytes
(),
expected
)
self
.
assertRaises
(
BufferError
,
a
.
__delitem__
,
slice
(
0
,
len
(
a
)))
self
.
assertEqual
(
m
.
tobytes
(),
expected
)
class
StringTest
(
BaseTest
):
...
...
Modules/arraymodule.c
View file @
7e4f3215
...
...
@@ -735,6 +735,14 @@ array_ass_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
ihigh
=
Py_SIZE
(
a
);
item
=
a
->
ob_item
;
d
=
n
-
(
ihigh
-
ilow
);
/* Issue #4509: If the array has exported buffers and the slice
assignment would change the size of the array, fail early to make
sure we don't modify it. */
if
(
d
!=
0
&&
a
->
ob_exports
>
0
)
{
PyErr_SetString
(
PyExc_BufferError
,
"cannot resize an array that is exporting buffers"
);
return
-
1
;
}
if
(
d
<
0
)
{
/* Delete -d items */
memmove
(
item
+
(
ihigh
+
d
)
*
a
->
ob_descr
->
itemsize
,
item
+
ihigh
*
a
->
ob_descr
->
itemsize
,
...
...
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