[Python-checkins] bpo-31740: Prevent refleaks when sqlite3.Connection.__init__() is called more than once (GH-3944)
Victor Stinner
webhook-mailer at python.org
Tue Oct 10 15:27:49 EDT 2017
https://github.com/python/cpython/commit/93c5a5df8ea118f6e4a153a7c8cccd65a5ff8bff
commit: 93c5a5df8ea118f6e4a153a7c8cccd65a5ff8bff
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-10-10T12:27:46-07:00
summary:
bpo-31740: Prevent refleaks when sqlite3.Connection.__init__() is called more than once (GH-3944)
files:
M Modules/_sqlite/connection.c
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 27591164b82..70e56aad520 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -97,15 +97,15 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
self->begin_statement = NULL;
- self->statement_cache = NULL;
- self->statements = NULL;
- self->cursors = NULL;
+ Py_CLEAR(self->statement_cache);
+ Py_CLEAR(self->statements);
+ Py_CLEAR(self->cursors);
Py_INCREF(Py_None);
- self->row_factory = Py_None;
+ Py_XSETREF(self->row_factory, Py_None);
Py_INCREF(&PyUnicode_Type);
- self->text_factory = (PyObject*)&PyUnicode_Type;
+ Py_XSETREF(self->text_factory, (PyObject*)&PyUnicode_Type);
#ifdef SQLITE_OPEN_URI
Py_BEGIN_ALLOW_THREADS
@@ -137,7 +137,7 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
} else {
Py_INCREF(isolation_level);
}
- self->isolation_level = NULL;
+ Py_CLEAR(self->isolation_level);
if (pysqlite_connection_set_isolation_level(self, isolation_level) < 0) {
Py_DECREF(isolation_level);
return -1;
@@ -177,12 +177,12 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
}
self->check_same_thread = check_same_thread;
- self->function_pinboard = PyDict_New();
+ Py_XSETREF(self->function_pinboard, PyDict_New());
if (!self->function_pinboard) {
return -1;
}
- self->collations = PyDict_New();
+ Py_XSETREF(self->collations, PyDict_New());
if (!self->collations) {
return -1;
}
More information about the Python-checkins
mailing list