Merge remote-tracking branch 'origin/5.9' into 5.11

Change-Id: I31a0ff26bc02e6cc2ec2a816c16d170fc334f800

1 files changed, 3 insertions, 1 deletions

diff --git a/sources/shiboken2/libshiboken/shibokenbuffer.cpp b/sources/shiboken2/libshiboken/shibokenbuffer.cpp
index 2404aeb66..05b68dade 100644
--- a/sources/shiboken2/libshiboken/shibokenbuffer.cpp
+++ b/sources/shiboken2/libshiboken/shibokenbuffer.cpp
@@ -84,7 +84,9 @@ PyObject* Shiboken::Buffer::newObject(void* memory, Py_ssize_t size, Type type)
     view.itemsize = sizeof(char);
     Py_ssize_t shape[] = { size };
     view.shape = shape;
-    return PyMemoryView_FromBuffer(&view);
+    // Pep384: This is way too complicated and impossible with the limited api:
+    //return PyMemoryView_FromBuffer(&view);
+    return PyMemoryView_FromMemory((char *)view.buf, size, type == ReadOnly ? PyBUF_READ : PyBUF_WRITE);
 #else
     return type == ReadOnly ? PyBuffer_FromMemory(memory, size) : PyBuffer_FromReadWriteMemory(memory, size);
 #endif