From f458a036178844beae8bc332e5b5a0570276be3c Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 2 Feb 2013 18:45:22 +0200 Subject: Issue #17034: Use Py_CLEAR() in bytesobject.c. --- Objects/bytesobject.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index c0f5aff..b60a8b0 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 ****************************/ -- cgit v0.12