Issue #20437: Fixed 22 potential bugs when deleting objects references.

serhiy-storchaka · serhiy-storchaka · commit dfe98a102ec8 · 2014-02-09T13:46:20.000+02:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: 2014-02-09
 Core and Builtins
 -----------------
 
+- Issue #20437: Fixed 22 potential bugs when deleting objects references.
+
 - Issue #20500: Displaying an exception at interpreter shutdown no longer
   risks triggering an assertion failure in PyObject_Str.
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -159,10 +159,8 @@ _DictRemover_call(PyObject *myself, PyObject *args, PyObject *kw)
         if (-1 == PyDict_DelItem(self->dict, self->key))
             /* XXX Error context */
             PyErr_WriteUnraisable(Py_None);
-        Py_DECREF(self->key);
-        self->key = NULL;
-        Py_DECREF(self->dict);
-        self->dict = NULL;
+        Py_CLEAR(self->key);
+        Py_CLEAR(self->dict);
     }
     Py_INCREF(Py_None);
     return Py_None;
@@ -2934,10 +2932,8 @@ static int
 PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
 {
     if (ob == NULL) {
-        Py_XDECREF(self->restype);
-        self->restype = NULL;
-        Py_XDECREF(self->checker);
-        self->checker = NULL;
+        Py_CLEAR(self->restype);
+        Py_CLEAR(self->checker);
         return 0;
     }
     if (ob != Py_None && !PyType_stgdict(ob) && !PyCallable_Check(ob)) {
@@ -2980,10 +2976,8 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
     PyObject *converters;
 
     if (ob == NULL || ob == Py_None) {
-        Py_XDECREF(self->converters);
-        self->converters = NULL;
-        Py_XDECREF(self->argtypes);
-        self->argtypes = NULL;
+        Py_CLEAR(self->converters);
+        Py_CLEAR(self->argtypes);
     } else {
         converters = converters_from_argtypes(ob);
         if (!converters)
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -229,8 +229,7 @@ int pysqlite_build_row_cast_map(pysqlite_Cursor* self)
             if (converter != Py_None) {
                 Py_DECREF(converter);
             }
-            Py_XDECREF(self->row_cast_map);
-            self->row_cast_map = NULL;
+            Py_CLEAR(self->row_cast_map);
 
             return -1;
         }
@@ -447,8 +446,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
     self->locked = 1;
     self->reset = 0;
 
-    Py_XDECREF(self->next_row);
-    self->next_row = NULL;
+    Py_CLEAR(self->next_row);
 
     if (multiple) {
         /* executemany() */
@@ -864,8 +862,7 @@ PyObject* pysqlite_cursor_iternext(pysqlite_Cursor *self)
     if (!self->next_row) {
          if (self->statement) {
             (void)pysqlite_statement_reset(self->statement);
-            Py_DECREF(self->statement);
-            self->statement = NULL;
+            Py_CLEAR(self->statement);
         }
         return NULL;
     }
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -780,8 +780,7 @@ typedef struct {
 static void
 path_cleanup(path_t *path) {
     if (path->cleanup) {
-        Py_DECREF(path->cleanup);
-        path->cleanup = NULL;
+        Py_CLEAR(path->cleanup);
     }
 }
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
@@ -317,8 +317,7 @@ call_with_frame(PyCodeObject *c, PyObject* func, PyObject* args,
     }
     else {
         if (trace_frame(tstate, f, PyTrace_RETURN, res) < 0) {
-            Py_XDECREF(res);
-            res = NULL;
+            Py_CLEAR(res);
         }
     }
 #else
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -281,8 +281,7 @@ set_hook(const char *funcname, PyObject **hook_var, PyObject *args)
     if (!PyArg_ParseTuple(args, buf, &function))
         return NULL;
     if (function == Py_None) {
-        Py_XDECREF(*hook_var);
-        *hook_var = NULL;
+        Py_CLEAR(*hook_var);
     }
     else if (PyCallable_Check(function)) {
         PyObject *tmp = *hook_var;
@@ -885,7 +884,7 @@ on_completion_display_matches_hook(char **matches,
         (r != Py_None && PyLong_AsLong(r) == -1 && PyErr_Occurred())) {
         goto error;
     }
-    Py_XDECREF(r); r=NULL;
+    Py_CLEAR(r);
 
     if (0) {
     error:
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -66,8 +66,7 @@ reap_obj(pylist fd2obj[FD_SETSIZE + 1])
 {
     int i;
     for (i = 0; i < FD_SETSIZE + 1 && fd2obj[i].sentinel >= 0; i++) {
-        Py_XDECREF(fd2obj[i].obj);
-        fd2obj[i].obj = NULL;
+        Py_CLEAR(fd2obj[i].obj);
     }
     fd2obj[0].sentinel = -1;
 }
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -1305,12 +1305,9 @@ finisignal(void)
         Py_XDECREF(func);
     }
 
-    Py_XDECREF(IntHandler);
-    IntHandler = NULL;
-    Py_XDECREF(DefaultHandler);
-    DefaultHandler = NULL;
-    Py_XDECREF(IgnoreHandler);
-    IgnoreHandler = NULL;
+    Py_CLEAR(IntHandler);
+    Py_CLEAR(DefaultHandler);
+    Py_CLEAR(IgnoreHandler);
 }
 
 
diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
@@ -197,8 +197,7 @@ syslog_closelog(PyObject *self, PyObject *unused)
 {
     if (S_log_open) {
         closelog();
-        Py_XDECREF(S_ident_o);
-        S_ident_o = NULL;
+        Py_CLEAR(S_ident_o);
         S_log_open = 0;
     }
     Py_INCREF(Py_None);
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
@@ -463,8 +463,7 @@ zlib_compressobj_impl(PyModuleDef *module, int level, int method, int wbits, int
     }
 
  error:
-    Py_XDECREF(self);
-    self = NULL;
+    Py_CLEAR(self);
  success:
     return (PyObject*)self;
 }
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
@@ -879,8 +879,7 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
     _Py_ForgetReference((PyObject *) v);
     /* DECREF items deleted by shrinkage */
     for (i = newsize; i < oldsize; i++) {
-        Py_XDECREF(v->ob_item[i]);
-        v->ob_item[i] = NULL;
+        Py_CLEAR(v->ob_item[i]);
     }
     sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
     if (sv == NULL) {
@@ -926,8 +925,7 @@ PyTuple_Fini(void)
 #if PyTuple_MAXSAVESIZE > 0
     /* empty tuples are used all over the place and applications may
      * rely on the fact that an empty tuple is a singleton. */
-    Py_XDECREF(free_list[0]);
-    free_list[0] = NULL;
+    Py_CLEAR(free_list[0]);
 
     (void)PyTuple_ClearFreeList();
 #endif
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -1902,8 +1902,7 @@ _PyUnicode_ClearStaticStrings()
 {
     _Py_Identifier *tmp, *s = static_strings;
     while (s) {
-        Py_DECREF(s->object);
-        s->object = NULL;
+        Py_CLEAR(s->object);
         tmp = s->next;
         s->next = NULL;
         s = tmp;
@@ -4005,8 +4004,7 @@ make_decode_exception(PyObject **exceptionObject,
     return;
 
 onError:
-    Py_DECREF(*exceptionObject);
-    *exceptionObject = NULL;
+    Py_CLEAR(*exceptionObject);
 }
 
 #ifdef HAVE_MBCS
@@ -6366,8 +6364,7 @@ make_encode_exception(PyObject **exceptionObject,
             goto onError;
         return;
       onError:
-        Py_DECREF(*exceptionObject);
-        *exceptionObject = NULL;
+        Py_CLEAR(*exceptionObject);
     }
 }
 
@@ -8410,8 +8407,7 @@ make_translate_exception(PyObject **exceptionObject,
             goto onError;
         return;
       onError:
-        Py_DECREF(*exceptionObject);
-        *exceptionObject = NULL;
+        Py_CLEAR(*exceptionObject);
     }
 }
 
@@ -13502,8 +13498,7 @@ _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
         PyObject *newbuffer;
         newbuffer = resize_compact(writer->buffer, writer->pos);
         if (newbuffer == NULL) {
-            Py_DECREF(writer->buffer);
-            writer->buffer = NULL;
+            Py_CLEAR(writer->buffer);
             return NULL;
         }
         writer->buffer = newbuffer;
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3189,8 +3189,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                 if (call_trace(tstate->c_tracefunc, tstate->c_traceobj,
                                tstate, f,
                                PyTrace_RETURN, retval)) {
-                    Py_XDECREF(retval);
-                    retval = NULL;
+                    Py_CLEAR(retval);
                     why = WHY_EXCEPTION;
                 }
             }
@@ -3209,8 +3208,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             else if (call_trace(tstate->c_profilefunc, tstate->c_profileobj,
                                 tstate, f,
                                 PyTrace_RETURN, retval)) {
-                Py_XDECREF(retval);
-                retval = NULL;
+                Py_CLEAR(retval);
                 /* why = WHY_EXCEPTION; */
             }
         }
@@ -3568,8 +3566,7 @@ PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals,
     if (co->co_flags & CO_GENERATOR) {
         /* Don't need to keep the reference to f_back, it will be set
          * when the generator is resumed. */
-        Py_XDECREF(f->f_back);
-        f->f_back = NULL;
+        Py_CLEAR(f->f_back);
 
         PCALL(PCALL_GENERATOR);
 
diff --git a/Python/import.c b/Python/import.c
@@ -349,8 +349,7 @@ _imp_release_lock_impl(PyModuleDef *module)
 void
 _PyImport_Fini(void)
 {
-    Py_XDECREF(extensions);
-    extensions = NULL;
+    Py_CLEAR(extensions);
 #ifdef WITH_THREAD
     if (import_lock != NULL) {
         PyThread_free_lock(import_lock);
@@ -598,8 +597,7 @@ _PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
             /* Somebody already imported the module,
                likely under a different name.
                XXX this should really not happen. */
-            Py_DECREF(def->m_base.m_copy);
-            def->m_base.m_copy = NULL;
+            Py_CLEAR(def->m_base.m_copy);
         }
         dict = PyModule_GetDict(mod);
         if (dict == NULL)
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -430,8 +430,7 @@ trace_trampoline(PyObject *self, PyFrameObject *frame,
     result = call_trampoline(callback, frame, what, arg);
     if (result == NULL) {
         PyEval_SetTrace(NULL, NULL);
-        Py_XDECREF(frame->f_trace);
-        frame->f_trace = NULL;
+        Py_CLEAR(frame->f_trace);
         return -1;
     }
     if (result != Py_None) {

Original file line number	Diff line number	Diff line change
`@@ -780,8 +780,7 @@ typedef struct {`
`780`	`780`	`static void`
`781`	`781`	`path_cleanup(path_t *path) {`
`782`	`782`	`if (path->cleanup) {`
`783`		`- Py_DECREF(path->cleanup);`
`784`		`- path->cleanup = NULL;`
	`783`	`+ Py_CLEAR(path->cleanup);`
`785`	`784`	`}`
`786`	`785`	`}`
`787`	`786`
Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,7 @@ call_with_frame(PyCodeObject c, PyObject func, PyObject* args,`
`317`	`317`	`}`
`318`	`318`	`else {`
`319`	`319`	`if (trace_frame(tstate, f, PyTrace_RETURN, res) < 0) {`
`320`		`- Py_XDECREF(res);`
`321`		`- res = NULL;`
	`320`	`+ Py_CLEAR(res);`
`322`	`321`	`}`
`323`	`322`	`}`
`324`	`323`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,7 @@ reap_obj(pylist fd2obj[FD_SETSIZE + 1])`
`66`	`66`	`{`
`67`	`67`	`int i;`
`68`	`68`	`for (i = 0; i < FD_SETSIZE + 1 && fd2obj[i].sentinel >= 0; i++) {`
`69`		`- Py_XDECREF(fd2obj[i].obj);`
`70`		`- fd2obj[i].obj = NULL;`
	`69`	`+ Py_CLEAR(fd2obj[i].obj);`
`71`	`70`	`}`
`72`	`71`	`fd2obj[0].sentinel = -1;`
`73`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1305,12 +1305,9 @@ finisignal(void)`
`1305`	`1305`	`Py_XDECREF(func);`
`1306`	`1306`	`}`
`1307`	`1307`
`1308`		`- Py_XDECREF(IntHandler);`
`1309`		`- IntHandler = NULL;`
`1310`		`- Py_XDECREF(DefaultHandler);`
`1311`		`- DefaultHandler = NULL;`
`1312`		`- Py_XDECREF(IgnoreHandler);`
`1313`		`- IgnoreHandler = NULL;`
	`1308`	`+ Py_CLEAR(IntHandler);`
	`1309`	`+ Py_CLEAR(DefaultHandler);`
	`1310`	`+ Py_CLEAR(IgnoreHandler);`
`1314`	`1311`	`}`
`1315`	`1312`
`1316`	`1313`
Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,7 @@ syslog_closelog(PyObject self, PyObject unused)`
`197`	`197`	`{`
`198`	`198`	`if (S_log_open) {`
`199`	`199`	`closelog();`
`200`		`- Py_XDECREF(S_ident_o);`
`201`		`- S_ident_o = NULL;`
	`200`	`+ Py_CLEAR(S_ident_o);`
`202`	`201`	`S_log_open = 0;`
`203`	`202`	`}`
`204`	`203`	`Py_INCREF(Py_None);`
Original file line number	Diff line number	Diff line change
`@@ -463,8 +463,7 @@ zlib_compressobj_impl(PyModuleDef *module, int level, int method, int wbits, int`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`error:`
`466`		`- Py_XDECREF(self);`
`467`		`- self = NULL;`
	`466`	`+ Py_CLEAR(self);`
`468`	`467`	`success:`
`469`	`468`	`return (PyObject*)self;`
`470`	`469`	`}`