]> granicus.if.org Git - python/commitdiff
Issue #27342: Replaced some Py_XDECREFs with Py_DECREFs.
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 18 Jun 2016 06:44:03 +0000 (09:44 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 18 Jun 2016 06:44:03 +0000 (09:44 +0300)
Patch by Xiang Zhang.

Objects/rangeobject.c
Python/bltinmodule.c

index 0e9eb20154b7a0cf8d961263c6e02888d54a7632..f3ef44cd3628229cb7d92ec6c70319598d2cc08b 100644 (file)
@@ -129,9 +129,9 @@ range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
         return (PyObject *) obj;
 
     /* Failed to create object, release attributes */
-    Py_XDECREF(start);
-    Py_XDECREF(stop);
-    Py_XDECREF(step);
+    Py_DECREF(start);
+    Py_DECREF(stop);
+    Py_DECREF(step);
     return NULL;
 }
 
@@ -196,7 +196,7 @@ compute_range_length(PyObject *start, PyObject *stop, PyObject *step)
     /* if (lo >= hi), return length of 0. */
     cmp_result = PyObject_RichCompareBool(lo, hi, Py_GE);
     if (cmp_result != 0) {
-        Py_XDECREF(step);
+        Py_DECREF(step);
         if (cmp_result < 0)
             return NULL;
         return PyLong_FromLong(0);
@@ -225,9 +225,9 @@ compute_range_length(PyObject *start, PyObject *stop, PyObject *step)
     return result;
 
   Fail:
+    Py_DECREF(step);
     Py_XDECREF(tmp2);
     Py_XDECREF(diff);
-    Py_XDECREF(step);
     Py_XDECREF(tmp1);
     Py_XDECREF(one);
     return NULL;
index 0637a2ded9b54b7bd3d1fdfc2bae0eef95145d2e..7d35cdbf46a7c7bd1cb253a604ff242b416f4c74 100644 (file)
@@ -2711,10 +2711,10 @@ _PyBuiltin_Init(void)
     SETBUILTIN("zip",                   &PyZip_Type);
     debug = PyBool_FromLong(Py_OptimizeFlag == 0);
     if (PyDict_SetItemString(dict, "__debug__", debug) < 0) {
-        Py_XDECREF(debug);
+        Py_DECREF(debug);
         return NULL;
     }
-    Py_XDECREF(debug);
+    Py_DECREF(debug);
 
     return mod;
 #undef ADD_TO_ALL