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
5bffa79c
Commit
5bffa79c
authored
Feb 24, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with
a buffer struct having a NULL data pointer.
parent
1ce92dc2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
0 deletions
+21
-0
Lib/test/test_capi.py
Lib/test/test_capi.py
+2
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_testcapimodule.c
Modules/_testcapimodule.c
+11
-0
Objects/memoryobject.c
Objects/memoryobject.c
+5
-0
No files found.
Lib/test/test_capi.py
View file @
5bffa79c
...
...
@@ -50,6 +50,8 @@ class CAPITest(unittest.TestCase):
b'Fatal Python error:'
b' PyThreadState_Get: no current thread'
)
def
test_memoryview_from_NULL_pointer
(
self
):
self
.
assertRaises
(
ValueError
,
_testcapi
.
make_memoryview_from_NULL_pointer
)
@
unittest
.
skipUnless
(
threading
,
'Threading required for this test.'
)
class
TestPendingCalls
(
unittest
.
TestCase
):
...
...
Misc/NEWS
View file @
5bffa79c
...
...
@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins
-----------------
- Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with
a buffer struct having a NULL data pointer.
- Issue #11272: On Windows, input() strips '
\
r
' (and not only '
\
n
'), and
sys.stdin uses universal newline (replace '
\
r
\
n
' by '
\
n
').
...
...
Modules/_testcapimodule.c
View file @
5bffa79c
...
...
@@ -2231,6 +2231,15 @@ make_exception_with_doc(PyObject *self, PyObject *args, PyObject *kwargs)
return
PyErr_NewExceptionWithDoc
(
name
,
doc
,
base
,
dict
);
}
static
PyObject
*
make_memoryview_from_NULL_pointer
(
PyObject
*
self
)
{
Py_buffer
info
;
if
(
PyBuffer_FillInfo
(
&
info
,
NULL
,
NULL
,
1
,
1
,
PyBUF_FULL_RO
)
<
0
)
return
NULL
;
return
PyMemoryView_FromBuffer
(
&
info
);
}
/* Test that the fatal error from not having a current thread doesn't
cause an infinite loop. Run via Lib/test/test_capi.py */
static
PyObject
*
...
...
@@ -2326,6 +2335,8 @@ static PyMethodDef TestMethods[] = {
{
"code_newempty"
,
code_newempty
,
METH_VARARGS
},
{
"make_exception_with_doc"
,
(
PyCFunction
)
make_exception_with_doc
,
METH_VARARGS
|
METH_KEYWORDS
},
{
"make_memoryview_from_NULL_pointer"
,
(
PyCFunction
)
make_memoryview_from_NULL_pointer
,
METH_NOARGS
},
{
"crash_no_current_thread"
,
(
PyCFunction
)
crash_no_current_thread
,
METH_NOARGS
},
{
NULL
,
NULL
}
/* sentinel */
};
...
...
Objects/memoryobject.c
View file @
5bffa79c
...
...
@@ -75,6 +75,11 @@ PyMemoryView_FromBuffer(Py_buffer *info)
{
PyMemoryViewObject
*
mview
;
if
(
info
->
buf
==
NULL
)
{
PyErr_SetString
(
PyExc_ValueError
,
"cannot make memory view from a buffer with a NULL data pointer"
);
return
NULL
;
}
mview
=
(
PyMemoryViewObject
*
)
PyObject_GC_New
(
PyMemoryViewObject
,
&
PyMemoryView_Type
);
if
(
mview
==
NULL
)
...
...
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