xdecref not decref

Author: philippedistributive

src/PyListProxyHandler.cc

@@ -47,7 +47,7 @@ static bool makeNewPyMethod(JSContext *cx, JS::MutableHandleValue function, JS::
   thisValue.setObject(*thisObject);
   PyObject *newSelf = pyTypeFactory(cx, thisValue);
   function.set(jsTypeFactory(cx, PyMethod_New(func, newSelf)));
-  Py_DECREF(newSelf);
+  Py_XDECREF(newSelf);
 
   return true;
 }
@@ -114,10 +114,10 @@ static bool array_push(JSContext *cx, unsigned argc, JS::Value *vp) { // surely
     elementVal.set(args[index].get());
     PyObject *value = pyTypeFactory(cx, elementVal);
     if (PyList_Append(self, value) < 0) {
-      Py_DECREF(value);
+      Py_XDECREF(value);
       return false;
     }
-    Py_DECREF(value);
+    Py_XDECREF(value);
   }
 
   args.rval().setInt32(PyList_GET_SIZE(self));
@@ -166,10 +166,10 @@ static bool array_unshift(JSContext *cx, unsigned argc, JS::Value *vp) { // sure
     elementVal.set(args[index].get());
     PyObject *value = pyTypeFactory(cx, elementVal);
     if (PyList_Insert(self, 0, value) < 0) {
-      Py_DECREF(value);
+      Py_XDECREF(value);
       return false;
     }
-    Py_DECREF(value);
+    Py_XDECREF(value);
   }
 
   args.rval().setInt32(PyList_GET_SIZE(self));
@@ -281,7 +281,7 @@ static bool array_indexOf(JSContext *cx, unsigned argc, JS::Value *vp) {
   JS::RootedValue elementVal(cx, args[0].get());
   PyObject *value = pyTypeFactory(cx, elementVal);
   PyObject *result = PyObject_CallMethod(self, "index", "Oi", value, start);
-  Py_DECREF(value);
+  Py_XDECREF(value);
 
   if (!result) {
     PyErr_Clear();
@@ -364,10 +364,8 @@ static bool array_splice(JSContext *cx, unsigned argc, JS::Value *vp) {
     elementVal.set(args[index + 2].get());
     PyObject *value = pyTypeFactory(cx, elementVal);
     if (PyList_SetItem(inserted, index, value) < 0) {
-      Py_DECREF(value);
       return false;
     }
-    Py_DECREF(value);
   }
 
   if (PyList_SetSlice(self, actualStart, actualStart + actualDeleteCount, inserted) < 0) {
@@ -430,12 +428,18 @@ static bool array_fill(JSContext *cx, unsigned argc, JS::Value *vp) {
 
   JS::RootedValue fillValue(cx, args[0].get());
   PyObject *fillValueItem = pyTypeFactory(cx, fillValue);
+  bool setItemCalled = false;
   for (int index = actualStart; index < actualEnd; index++) {
+    setItemCalled = true;
     if (PyList_SetItem(self, index, fillValueItem) < 0) {
       return false;
     }
   }
 
+  if (!setItemCalled) {
+    Py_XDECREF(fillValueItem);
+  }
+
   // return ref to self
   args.rval().set(jsTypeFactory(cx, self));
   return true;

src/PyObjectProxyHandler.cc

@@ -176,10 +176,10 @@ bool PyObjectProxyHandler::set(JSContext *cx, JS::HandleObject proxy, JS::Handle
   PyObject *self = JS::GetMaybePtrFromReservedSlot<PyObject>(proxy, PyObjectSlot);
   PyObject *value = pyTypeFactory(cx, rootedV);
   if (PyObject_SetAttr(self, attrName, value)) {
-    Py_DECREF(value);
+    Py_XDECREF(value);
     return result.failCantSetInterposed(); // raises JS exception
   }
-  Py_DECREF(value);
+  Py_XDECREF(value);
   return result.succeed();
 }
 

src/internalBinding/timers.cc

@@ -32,7 +32,7 @@ static bool enqueueWithDelay(JSContext *cx, unsigned argc, JS::Value *vp) {
   PyEventLoop loop = PyEventLoop::getRunningLoop();
   if (!loop.initialized()) return false;
   PyEventLoop::AsyncHandle::id_t handleId = loop.enqueueWithDelay(job, delaySeconds, repeat);
-  Py_DECREF(job);
+  Py_XDECREF(job);
 
   // Return the `timeoutID` to use in `clearTimeout`
   args.rval().setNumber(handleId);