From cfdfbb4d3c39ee1e728aa80da55c1f25d00be4d1 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 18 Jun 2016 09:44:03 +0300 Subject: [PATCH] Issue #27342: Replaced some Py_XDECREFs with Py_DECREFs. Patch by Xiang Zhang. --- Objects/rangeobject.c | 10 +++++----- Python/bltinmodule.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 0e9eb20154b..f3ef44cd362 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -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; diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 0637a2ded9b..7d35cdbf46a 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -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