From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 2 Feb 2013 16:45:22 +0000 (+0200)
Subject: Issue #17034: Use Py_CLEAR() in bytesobject.c.
X-Git-Tag: v3.2.4rc1~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f458a036178844beae8bc332e5b5a0570276be3c;p=thirdparty%2FPython%2Fcpython.git

Issue #17034: Use Py_CLEAR() in bytesobject.c.
---

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index c0f5aff7dc23..b60a8b06c336 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2800,8 +2800,7 @@ PyBytes_Concat(register PyObject **pv, register PyObject *w)
     if (*pv == NULL)
         return;
     if (w == NULL) {
-        Py_DECREF(*pv);
-        *pv = NULL;
+        Py_CLEAR(*pv);
         return;
     }
     v = bytes_concat(*pv, w);
@@ -3008,12 +3007,9 @@ void
 PyBytes_Fini(void)
 {
     int i;
-    for (i = 0; i < UCHAR_MAX + 1; i++) {
-        Py_XDECREF(characters[i]);
-        characters[i] = NULL;
-    }
-    Py_XDECREF(nullstring);
-    nullstring = NULL;
+    for (i = 0; i < UCHAR_MAX + 1; i++)
+        Py_CLEAR(characters[i]);
+    Py_CLEAR(nullstring);
 }
 
 /*********************** Bytes Iterator ****************************/