Issue #26200: Added Py_SETREF and replaced Py_XSETREF with Py_SETREF
in places where Py_DECREF was used.
diff --git a/Include/object.h b/Include/object.h
index da8befa..0c88603 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -851,18 +851,28 @@
*
* As in case of Py_CLEAR "the obvious" code can be deadly:
*
- * Py_XDECREF(op);
+ * Py_DECREF(op);
* op = op2;
*
* The safe way is:
*
- * Py_XSETREF(op, op2);
+ * Py_SETREF(op, op2);
*
* That arranges to set `op` to `op2` _before_ decref'ing, so that any code
* triggered as a side-effect of `op` getting torn down no longer believes
* `op` points to a valid object.
+ *
+ * Py_XSETREF is a variant of Py_SETREF that uses Py_XDECREF instead of
+ * Py_DECREF.
*/
+#define Py_SETREF(op, op2) \
+ do { \
+ PyObject *_py_tmp = (PyObject *)(op); \
+ (op) = (op2); \
+ Py_DECREF(_py_tmp); \
+ } while (0)
+
#define Py_XSETREF(op, op2) \
do { \
PyObject *_py_tmp = (PyObject *)(op); \
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 2bf088a..060dca5 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -391,7 +391,7 @@
Py_DECREF((PyObject *)dict);
return NULL;
}
- Py_XSETREF(result->tp_dict, (PyObject *)dict);
+ Py_SETREF(result->tp_dict, (PyObject *)dict);
dict->format = _ctypes_alloc_format_string(NULL, "B");
if (dict->format == NULL) {
Py_DECREF(result);
@@ -960,7 +960,7 @@
Py_DECREF((PyObject *)stgdict);
return NULL;
}
- Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
+ Py_SETREF(result->tp_dict, (PyObject *)stgdict);
return (PyObject *)result;
}
@@ -1403,7 +1403,7 @@
/* replace the class dict by our updated spam dict */
if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict))
goto error;
- Py_XSETREF(result->tp_dict, (PyObject *)stgdict); /* steal the reference */
+ Py_SETREF(result->tp_dict, (PyObject *)stgdict); /* steal the reference */
stgdict = NULL;
/* Special case for character arrays.
@@ -1816,7 +1816,7 @@
Py_DECREF((PyObject *)stgdict);
return NULL;
}
- Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
+ Py_SETREF(result->tp_dict, (PyObject *)stgdict);
return (PyObject *)result;
}
@@ -1944,7 +1944,7 @@
Py_DECREF((PyObject *)stgdict);
return NULL;
}
- Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
+ Py_SETREF(result->tp_dict, (PyObject *)stgdict);
/* Install from_param class methods in ctypes base classes.
Overrides the PyCSimpleType_from_param generic method.
@@ -2307,7 +2307,7 @@
Py_DECREF((PyObject *)stgdict);
return NULL;
}
- Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
+ Py_SETREF(result->tp_dict, (PyObject *)stgdict);
if (-1 == make_funcptrtype_dict(stgdict)) {
Py_DECREF(result);
@@ -5150,7 +5150,7 @@
return -1;
Py_INCREF(args);
- Py_XSETREF(((PyBaseExceptionObject *)self)->args, args);
+ Py_SETREF(((PyBaseExceptionObject *)self)->args, args);
return 0;
}
diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index 9ed2a4c..26bf094 100644
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -313,7 +313,7 @@
return NULL;
}
Py_INCREF(temp);
- Py_XSETREF(po->wo, temp);
+ Py_SETREF(po->wo, temp);
Py_INCREF(Py_None);
return Py_None;
}
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index e5191a0..261c4bc 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1058,7 +1058,7 @@
/* Offset is normalized, so it is negative if days < 0 */
if (GET_TD_DAYS(offset) < 0) {
sign = '-';
- Py_XSETREF(offset, delta_negative((PyDateTime_Delta *)offset));
+ Py_SETREF(offset, delta_negative((PyDateTime_Delta *)offset));
if (offset == NULL)
return -1;
}
@@ -3045,7 +3045,7 @@
if (dst == Py_None)
goto Inconsistent;
if (delta_bool((PyDateTime_Delta *)dst) != 0) {
- Py_XSETREF(result, add_datetime_timedelta((PyDateTime_DateTime *)result,
+ Py_SETREF(result, add_datetime_timedelta((PyDateTime_DateTime *)result,
(PyDateTime_Delta *)dst, 1));
if (result == NULL)
goto Fail;
@@ -4445,7 +4445,7 @@
return NULL;
if (offdiff != NULL) {
- Py_XSETREF(result, delta_subtract(result, offdiff));
+ Py_SETREF(result, delta_subtract(result, offdiff));
Py_DECREF(offdiff);
}
}
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 5c49c15..63639c7 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -1957,7 +1957,7 @@
{
_VALIDATE_ATTR_VALUE(value);
Py_INCREF(value);
- Py_XSETREF(self->tag, value);
+ Py_SETREF(self->tag, value);
return 0;
}
@@ -1990,7 +1990,7 @@
return -1;
}
Py_INCREF(value);
- Py_XSETREF(self->extra->attrib, value);
+ Py_SETREF(self->extra->attrib, value);
return 0;
}
@@ -2524,9 +2524,9 @@
self->index++;
Py_INCREF(node);
- Py_XSETREF(self->this, node);
+ Py_SETREF(self->this, node);
Py_INCREF(node);
- Py_XSETREF(self->last, node);
+ Py_SETREF(self->last, node);
if (treebuilder_append_event(self, self->start_event_obj, node) < 0)
goto error;
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index 84d2c5d..ca3a639 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -96,7 +96,7 @@
return -1;
memcpy(PyBytes_AS_STRING(new_buf), PyBytes_AS_STRING(self->buf),
self->string_size);
- Py_XSETREF(self->buf, new_buf);
+ Py_SETREF(self->buf, new_buf);
return 0;
}
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index f634877..4beed78 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -204,7 +204,7 @@
node = node->next;
}
- Py_XSETREF(self->statement_cache,
+ Py_SETREF(self->statement_cache,
(pysqlite_Cache *)PyObject_CallFunction((PyObject *)&pysqlite_CacheType, "O", self));
Py_DECREF(self);
self->statement_cache->decref_factory = 0;
@@ -793,7 +793,7 @@
}
}
- Py_XSETREF(self->statements, new_list);
+ Py_SETREF(self->statements, new_list);
}
static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
@@ -824,7 +824,7 @@
}
}
- Py_XSETREF(self->cursors, new_list);
+ Py_SETREF(self->cursors, new_list);
}
PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 552c8bb..23f3057 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -509,7 +509,7 @@
/* reset description and rowcount */
Py_INCREF(Py_None);
- Py_XSETREF(self->description, Py_None);
+ Py_SETREF(self->description, Py_None);
self->rowcount = -1L;
func_args = PyTuple_New(1);
@@ -534,7 +534,7 @@
}
if (self->statement->in_use) {
- Py_XSETREF(self->statement,
+ Py_SETREF(self->statement,
PyObject_New(pysqlite_Statement, &pysqlite_StatementType));
if (!self->statement) {
goto error;
@@ -651,7 +651,7 @@
numcols = sqlite3_column_count(self->statement->st);
Py_END_ALLOW_THREADS
- Py_XSETREF(self->description, PyTuple_New(numcols));
+ Py_SETREF(self->description, PyTuple_New(numcols));
if (!self->description) {
goto error;
}
diff --git a/Modules/_sre.c b/Modules/_sre.c
index ab8a17e..fb0ab03 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -753,7 +753,7 @@
if (!copy)
return 0;
- Py_XSETREF(*object, copy);
+ Py_SETREF(*object, copy);
return 1; /* success */
}
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index e6e98cd..994198c 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1589,7 +1589,7 @@
return -1;
#else
Py_INCREF(value);
- Py_XSETREF(self->ctx, (PySSLContext *)value);
+ Py_SETREF(self->ctx, (PySSLContext *)value);
SSL_set_SSL_CTX(self->ssl, self->ctx->ctx);
#endif
} else {
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 532ce01..1d550fa 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -622,7 +622,7 @@
link = teedataobject_jumplink(to->dataobj);
if (link == NULL)
return NULL;
- Py_XSETREF(to->dataobj, (teedataobject *)link);
+ Py_SETREF(to->dataobj, (teedataobject *)link);
to->index = 0;
}
value = teedataobject_getitem(to->dataobj, to->index);
@@ -3457,7 +3457,7 @@
return NULL;
Py_INCREF(newtotal);
- Py_XSETREF(lz->total, newtotal);
+ Py_SETREF(lz->total, newtotal);
return newtotal;
}
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 3edf158..da454de 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -1266,7 +1266,7 @@
if (Handlers[SIGINT].func == DefaultHandler) {
/* Install default int handler */
Py_INCREF(IntHandler);
- Py_XSETREF(Handlers[SIGINT].func, IntHandler);
+ Py_SETREF(Handlers[SIGINT].func, IntHandler);
old_siginthandler = PyOS_setsig(SIGINT, signal_handler);
}
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 3abb9f0..e840271 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -155,7 +155,7 @@
tmp = PyUnicode_FromFormat("%U%c", self->prefix, SEP);
if (tmp == NULL)
goto error;
- Py_XSETREF(self->prefix, tmp);
+ Py_SETREF(self->prefix, tmp);
}
}
else
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 04485ee..618a22d 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -667,7 +667,7 @@
PyBytes_AS_STRING(self->unused_data), old_size);
Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size,
self->zst.next_in, self->zst.avail_in);
- Py_XSETREF(self->unused_data, new_data);
+ Py_SETREF(self->unused_data, new_data);
self->zst.avail_in = 0;
}
}
@@ -679,7 +679,7 @@
(char *)self->zst.next_in, self->zst.avail_in);
if (new_data == NULL)
return -1;
- Py_XSETREF(self->unconsumed_tail, new_data);
+ Py_SETREF(self->unconsumed_tail, new_data);
}
return 0;
}
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index cbf8166..b935375 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -3697,7 +3697,7 @@
/* Multiple references, need to create new object */
PyObject *v;
v = bytes_concat(*pv, w);
- Py_XSETREF(*pv, v);
+ Py_SETREF(*pv, v);
}
}
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index c5f1a0a..261c16d 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -504,7 +504,7 @@
if (name != Py_None) {
Py_INCREF(name);
- Py_XSETREF(newfunc->func_name, name);
+ Py_SETREF(newfunc->func_name, name);
}
if (defaults != Py_None) {
Py_INCREF(defaults);
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 7c02be7..6e2d026 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -735,7 +735,7 @@
if (v == NULL)
return list_ass_slice(a, i, i+1, v);
Py_INCREF(v);
- Py_XSETREF(a->ob_item[i], v);
+ Py_SETREF(a->ob_item[i], v);
return 0;
}
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 7a114e0..2be32e0 100644
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -1064,7 +1064,7 @@
result = PyNumber_Add(r->start, product);
Py_DECREF(product);
if (result) {
- Py_XSETREF(r->index, new_index);
+ Py_SETREF(r->index, new_index);
}
else {
Py_DECREF(new_index);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index a01862d..865c6eb 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -424,7 +424,7 @@
type->tp_name = tp_name;
Py_INCREF(value);
- Py_XSETREF(((PyHeapTypeObject*)type)->ht_name, value);
+ Py_SETREF(((PyHeapTypeObject*)type)->ht_name, value);
return 0;
}
@@ -445,7 +445,7 @@
et = (PyHeapTypeObject*)type;
Py_INCREF(value);
- Py_XSETREF(et->ht_qualname, value);
+ Py_SETREF(et->ht_qualname, value);
return 0;
}
@@ -2903,7 +2903,7 @@
else
method_cache_misses++;
#endif
- Py_XSETREF(method_cache[h].name, name);
+ Py_SETREF(method_cache[h].name, name);
}
return res;
}
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2499a36..8dc2a38 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1830,7 +1830,7 @@
_Py_INCREF_UNICODE_EMPTY();
if (!unicode_empty)
return -1;
- Py_XSETREF(*p_unicode, unicode_empty);
+ Py_SETREF(*p_unicode, unicode_empty);
return 0;
}
@@ -1838,7 +1838,7 @@
PyObject *copy = resize_copy(unicode, length);
if (copy == NULL)
return -1;
- Py_XSETREF(*p_unicode, copy);
+ Py_SETREF(*p_unicode, copy);
return 0;
}
@@ -13547,7 +13547,7 @@
return -1;
_PyUnicode_FastCopyCharacters(newbuffer, 0,
writer->buffer, 0, writer->pos);
- Py_XSETREF(writer->buffer, newbuffer);
+ Py_SETREF(writer->buffer, newbuffer);
}
_PyUnicodeWriter_Update(writer);
return 0;
@@ -15264,7 +15264,7 @@
if (t) {
Py_INCREF(t);
- Py_XSETREF(*p, t);
+ Py_SETREF(*p, t);
return;
}
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 2d9d878..40f5c8e 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -730,7 +730,7 @@
goto handle_error;
}
else if (!is_true) {
- Py_XSETREF(*filename, PyUnicode_FromString("__main__"));
+ Py_SETREF(*filename, PyUnicode_FromString("__main__"));
if (*filename == NULL)
goto handle_error;
}
diff --git a/Python/ceval.c b/Python/ceval.c
index c83743d..d69b8d6 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3236,7 +3236,7 @@
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
- Py_XSETREF(*pfunc, self);
+ Py_SETREF(*pfunc, self);
na++;
/* n++; */
} else
@@ -4747,7 +4747,7 @@
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
- Py_XSETREF(*pfunc, self);
+ Py_SETREF(*pfunc, self);
na++;
n++;
} else
diff --git a/Python/errors.c b/Python/errors.c
index 1d6e432..47d7c4b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -311,9 +311,9 @@
--tstate->recursion_depth;
/* throw away the old exception and use the recursion error instead */
Py_INCREF(PyExc_RecursionError);
- Py_XSETREF(*exc, PyExc_RecursionError);
+ Py_SETREF(*exc, PyExc_RecursionError);
Py_INCREF(PyExc_RecursionErrorInst);
- Py_XSETREF(*val, PyExc_RecursionErrorInst);
+ Py_SETREF(*val, PyExc_RecursionErrorInst);
/* just keeping the old traceback */
return;
}