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
fa5d6a5f
Commit
fa5d6a5f
authored
Jan 29, 2015
by
Stefan Krah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #22668: Ensure that format strings survive slicing after casting.
parent
2934262f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
6 deletions
+73
-6
Include/memoryobject.h
Include/memoryobject.h
+2
-2
Lib/test/test_memoryview.py
Lib/test/test_memoryview.py
+19
-0
Objects/memoryobject.c
Objects/memoryobject.c
+52
-4
No files found.
Include/memoryobject.h
View file @
fa5d6a5f
...
...
@@ -45,7 +45,7 @@ typedef struct {
}
_PyManagedBufferObject
;
/*
static storage used for casting between formats
*/
/*
deprecated, removed in 3.5
*/
#define _Py_MEMORYVIEW_MAX_FORMAT 3
/* must be >= 3 */
/* memoryview state flags */
...
...
@@ -62,7 +62,7 @@ typedef struct {
int
flags
;
/* state flags */
Py_ssize_t
exports
;
/* number of buffer re-exports */
Py_buffer
view
;
/* private copy of the exporter's view */
char
format
[
_Py_MEMORYVIEW_MAX_FORMAT
];
/*
used for casting
*/
char
format
[
_Py_MEMORYVIEW_MAX_FORMAT
];
/*
deprecated, removed in 3.5
*/
PyObject
*
weakreflist
;
Py_ssize_t
ob_array
[
1
];
/* shape, strides, suboffsets */
}
PyMemoryViewObject
;
...
...
Lib/test/test_memoryview.py
View file @
fa5d6a5f
...
...
@@ -360,6 +360,25 @@ class AbstractMemoryTests:
self
.
assertEqual
(
list
(
reversed
(
m
)),
aslist
)
self
.
assertEqual
(
list
(
reversed
(
m
)),
list
(
m
[::
-
1
]))
def
test_issue22668
(
self
):
m
=
memoryview
(
bytes
(
range
(
8
)))
b
=
m
.
cast
(
'H'
)
c
=
b
[
0
:
2
]
d
=
memoryview
(
b
)
del
b
self
.
assertEqual
(
c
[
0
],
256
)
self
.
assertEqual
(
d
[
0
],
256
)
self
.
assertEqual
(
c
.
format
,
"H"
)
self
.
assertEqual
(
d
.
format
,
"H"
)
_
=
m
.
cast
(
'I'
)
self
.
assertEqual
(
c
[
0
],
256
)
self
.
assertEqual
(
d
[
0
],
256
)
self
.
assertEqual
(
c
.
format
,
"H"
)
self
.
assertEqual
(
d
.
format
,
"H"
)
# Variations on source objects for the buffer: bytes-like objects, then arrays
# with itemsize > 1.
...
...
Objects/memoryobject.c
View file @
fa5d6a5f
...
...
@@ -1135,6 +1135,51 @@ get_native_fmtchar(char *result, const char *fmt)
return
-
1
;
}
Py_LOCAL_INLINE
(
char
*
)
get_native_fmtstr
(
const
char
*
fmt
)
{
int
at
=
0
;
if
(
fmt
[
0
]
==
'@'
)
{
at
=
1
;
fmt
++
;
}
if
(
fmt
[
0
]
==
'\0'
||
fmt
[
1
]
!=
'\0'
)
{
return
NULL
;
}
#define RETURN(s) do { return at ? "@" s : s; } while (0)
switch
(
fmt
[
0
])
{
case
'c'
:
RETURN
(
"c"
);
case
'b'
:
RETURN
(
"b"
);
case
'B'
:
RETURN
(
"B"
);
case
'h'
:
RETURN
(
"h"
);
case
'H'
:
RETURN
(
"H"
);
case
'i'
:
RETURN
(
"i"
);
case
'I'
:
RETURN
(
"I"
);
case
'l'
:
RETURN
(
"l"
);
case
'L'
:
RETURN
(
"L"
);
#ifdef HAVE_LONG_LONG
case
'q'
:
RETURN
(
"q"
);
case
'Q'
:
RETURN
(
"Q"
);
#endif
case
'n'
:
RETURN
(
"n"
);
case
'N'
:
RETURN
(
"N"
);
case
'f'
:
RETURN
(
"f"
);
case
'd'
:
RETURN
(
"d"
);
#ifdef HAVE_C99_BOOL
case
'?'
:
RETURN
(
"?"
);
#else
case
'?'
:
RETURN
(
"?"
);
#endif
case
'P'
:
RETURN
(
"P"
);
}
return
NULL
;
}
/* Cast a memoryview's data type to 'format'. The input array must be
C-contiguous. At least one of input-format, output-format must have
byte size. The output array is 1-D, with the same byte length as the
...
...
@@ -1184,10 +1229,13 @@ cast_to_1D(PyMemoryViewObject *mv, PyObject *format)
goto
out
;
}
strncpy
(
mv
->
format
,
PyBytes_AS_STRING
(
asciifmt
),
_Py_MEMORYVIEW_MAX_FORMAT
);
mv
->
format
[
_Py_MEMORYVIEW_MAX_FORMAT
-
1
]
=
'\0'
;
view
->
format
=
mv
->
format
;
view
->
format
=
get_native_fmtstr
(
PyBytes_AS_STRING
(
asciifmt
));
if
(
view
->
format
==
NULL
)
{
/* NOT_REACHED: get_native_fmtchar() already validates the format. */
PyErr_SetString
(
PyExc_RuntimeError
,
"memoryview: internal error"
);
goto
out
;
}
view
->
itemsize
=
itemsize
;
view
->
ndim
=
1
;
...
...
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