Changeset 102411 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Dec 1, 2023 8:53:30 AM (16 months ago)

Author:

vboxsync

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

160554

Message:

libs/xpcom/python: Attempt at fixing python crashes on darwin.arm64 when using the limited API, the inherited tp_is_gc() method is crashing because it works on a different object type so we define our own, also limit comparison for different object types, bugref:10544 [3rd attempt, misunderstood what tp_is_gc is doing, we need to make all Py_nsIID objects as not GC'able]

Location:

trunk/src/libs/xpcom18a4/python

Files:

• Makefile.kmk (modified) (1 diff)
• src/PyIID.cpp (modified) (4 diffs)
• src/PyXPCOM.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -80 +80 @@
  #
  if exists "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9"
-  VBOX_PYTHON39_INC = /Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/Headers
-  VBOX_PYTHON39_LIB = /Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/lib/libpython3.9.dylib
+  VBOX_PYTHON39_INC = /Users/aeichner/python-3.11.6/include/python3.11
+  VBOX_PYTHON39_LIB = /Users/aeichner/python-3.11.6/lib/libpython3.9.dylib
  endif
  if exists "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.8"

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

@@ -237 +237 @@
                 { Py_tp_str,            (void *)(uintptr_t)&Py_nsIID::PyTypeMethod_str },
                 { Py_tp_richcompare,    (void *)(uintptr_t)&Py_nsIID::PyTypeMethod_richcompare },
+        { Py_tp_is_gc,          (void *)(uintptr_t)&Py_nsIID::PyTypeMethod_is_gc },
                 { 0, NULL } /* terminator */
         };
@@ -243 +244 @@
                 /* .basicsize: */       sizeof(Py_nsIID),
                 /* .itemsize: */        0,
-                /* .flags: */           0,
+                /* .flags: */           Py_TPFLAGS_DEFAULT,
                 /* .slots: */           aTypeSlots,
         };
@@ -320 +321 @@
 Py_nsIID::PyTypeMethod_richcompare(PyObject *self, PyObject *other, int op)
 {
+    nsIID iid;
+    if (!Py_nsIID::IIDFromPyObject(other, &iid))
+    {
+        /* Can't do comparison betsides equality/inequalityif the other object does not contain an IID. */
+        if (op == Py_EQ)
+            Py_RETURN_FALSE;
+        else if (op == Py_NE)
+            Py_RETURN_TRUE;
+
+        PyErr_SetString(PyExc_TypeError, "Comparison between different object types is not defined");
+        return NULL;
+    }
+
     PyObject *result = NULL;
         Py_nsIID *s_iid = (Py_nsIID *)self;
-        Py_nsIID *o_iid = (Py_nsIID *)other;
-        int rc = memcmp(&s_iid->m_iid, &o_iid->m_iid, sizeof(s_iid->m_iid));
+        int rc = memcmp(&s_iid->m_iid, &iid, sizeof(s_iid->m_iid));
     switch (op)
     {
@@ -409 +422 @@
         delete (Py_nsIID *)ob;
 }
+
+#ifdef Py_LIMITED_API
+/* static */ int
+Py_nsIID::PyTypeMethod_is_gc(PyObject *self)
+{
+    return 0;
+}
+#endif

trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h

@@ -586 +586 @@
         static NS_EXPORT_STATIC_MEMBER_(PyTypeObject *) s_pType;
         static PyTypeObject *GetTypeObject(void);
+    static int PyTypeMethod_is_gc(PyObject *self);
 #endif
         static NS_EXPORT_STATIC_MEMBER_(PyMethodDef) methods[];