Changeset 86333 in vbox for trunk/src/libs/xpcom18a4/python/src/PyGInputStream.cpp

Timestamp:

Sep 28, 2020 8:01:18 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140619

Message:

xpcom/python: Initial Py_LIMITED_API support. bugref:9840

File:

• trunk/src/libs/xpcom18a4/python/src/PyGInputStream.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/src/PyGInputStream.cpp

@@ -104 +104 @@
         nsresult nr = InvokeNativeViaPolicy(methodName, &ret, "i", count);
         if (NS_SUCCEEDED(nr)) {
-#ifndef VBOX /* unsafe cast on 64-bit hosts. */
+#if 0 /* VBox: new buffer protocol (though I could use it for Py_LIMITED_API and ditch the warning, but cpython specific) */
+                Py_buffer py_view;
+                if (PyObject_GetBuffer(ret, &py_view, PyBUF_SIMPLE) == 0) {
+                        if (py_view.len <= count) {
+                                count = py_view.len;
+                        } else {
+                                PyXPCOM_LogWarning("nsIInputStream::read() was asked for %d bytes, but the string returned is %d bytes - truncating!\n", count, py_size);
+                        }
+                        memcpy(buf, py_view.py_buf, count);
+                        PyBuffer_Release(&py_view);
+                        *_retval = count;
+                } else {
+                        PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", PyXPCOM_ObTypeName(ret));
+                        nr = HandleNativeGatewayError(methodName);
+                }
+#else  /* Old protocol: */
+# ifndef VBOX /* unsafe cast on 64-bit hosts. */
                 PRUint32 py_size;
                 const void *py_buf;
                 if (PyObject_AsReadBuffer(ret, &py_buf, (Py_ssize_t*)&py_size)!=0) {
-#else  /* VBOX */
+# else  /* VBOX */
                 const void *py_buf;
-# if PY_VERSION_HEX >= 0x02050000 || defined(PY_SSIZE_T_MIN)
+#  if PY_VERSION_HEX >= 0x02050000 || defined(PY_SSIZE_T_MIN)
                 Py_ssize_t py_size;
-# else
+#  else
                 int py_size;
+#  endif
+                if (PyObject_AsReadBuffer(ret, &py_buf, &py_size)!=0) {
 # endif /* VBOX */
-                if (PyObject_AsReadBuffer(ret, &py_buf, &py_size)!=0) {
-#endif /* VBOX */
-                        PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", ret->ob_type->tp_name);
+                        PyErr_Format(PyExc_TypeError, "nsIInputStream::read() method must return a buffer object - not a '%s' object", PyXPCOM_ObTypeName(ret));
                         nr = HandleNativeGatewayError(methodName);
                 } else {
@@ -127 +143 @@
                         *_retval = py_size;
                 }
+#endif
         }
         return nr;