Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 11:30:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return None when trying to make a memoryview buffer with a NULL pointer

Browse Source
This commit is contained in:
Robin Dunn
2017-09-27 19:17:19 -07:00
parent 88ed169615
commit a5eeca0a5c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/wxpy_api.sip
View File

@@ -453,12 +453,17 @@ bool i_wxPyCheckForApp(bool raiseException) {
PyObject* i_wxPyMakeBuffer(void* ptr, Py_ssize_t len, bool readOnly=false) {
// GIL should already be held
Py_buffer view;
int flags = PyBUF_FORMAT|PyBUF_ND;
if (!readOnly)
flags |= PyBUF_WRITABLE;
PyBuffer_FillInfo(&view, NULL, ptr, len, readOnly ? 1:0, flags);
return PyMemoryView_FromBuffer(&view);
if (ptr && len) {
Py_buffer view;
int flags = PyBUF_FORMAT|PyBUF_ND;
if (!readOnly)
flags |= PyBUF_WRITABLE;
PyBuffer_FillInfo(&view, NULL, ptr, len, readOnly ? 1:0, flags);
return PyMemoryView_FromBuffer(&view);
} else {
Py_INCREF(Py_None); return Py_None;
// return PyBytes_FromString(""); TODO: None or an empty string?
}
// // TODO: Consider using a sip.array object instead, like this:
// // Create a sip.array of bytes, and then convert to a memoryview which is