Issue #3153: sqlite leaks on error.

alexandre.vassalotti · alexandre.vassalotti · commit a16a184350cd · 2008-07-13T21:47:59.000Z
Changed statements of the form Py_DECREF(obj), obj = 0 to Py_CLEAR(obj). git-svn-id: http://svn.python.org/projects/python/trunk@64930 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -1014,19 +1014,16 @@ PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, Py
             _pysqlite_seterror(self->db, NULL);
         }
 
-        Py_DECREF(statement);
-        statement = 0;
+        Py_CLEAR(statement);
     } else {
         weakref = PyWeakref_NewRef((PyObject*)statement, NULL);
         if (!weakref) {
-            Py_DECREF(statement);
-            statement = 0;
+            Py_CLEAR(statement);
             goto error;
         }
 
         if (PyList_Append(self->statements, weakref) != 0) {
-            Py_DECREF(weakref);
-            statement = 0;
+            Py_CLEAR(weakref);
             goto error;
         }
 
@@ -1050,15 +1047,13 @@ PyObject* pysqlite_connection_execute(pysqlite_Connection* self, PyObject* args,
 
     method = PyObject_GetAttrString(cursor, "execute");
     if (!method) {
-        Py_DECREF(cursor);
-        cursor = 0;
+        Py_CLEAR(cursor);
         goto error;
     }
 
     result = PyObject_CallObject(method, args);
     if (!result) {
-        Py_DECREF(cursor);
-        cursor = 0;
+        Py_CLEAR(cursor);
     }
 
 error:
@@ -1081,15 +1076,13 @@ PyObject* pysqlite_connection_executemany(pysqlite_Connection* self, PyObject* a
 
     method = PyObject_GetAttrString(cursor, "executemany");
     if (!method) {
-        Py_DECREF(cursor);
-        cursor = 0;
+        Py_CLEAR(cursor);
         goto error;
     }
 
     result = PyObject_CallObject(method, args);
     if (!result) {
-        Py_DECREF(cursor);
-        cursor = 0;
+        Py_CLEAR(cursor);
     }
 
 error:
@@ -1112,15 +1105,13 @@ PyObject* pysqlite_connection_executescript(pysqlite_Connection* self, PyObject*
 
     method = PyObject_GetAttrString(cursor, "executescript");
     if (!method) {
-        Py_DECREF(cursor);
-        cursor = 0;
+        Py_CLEAR(cursor);
         goto error;
     }
 
     result = PyObject_CallObject(method, args);
     if (!result) {
-        Py_DECREF(cursor);
-        cursor = 0;
+        Py_CLEAR(cursor);
     }
 
 error:
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -545,7 +545,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
         }
         rc = pysqlite_statement_create(self->statement, self->connection, operation);
         if (rc != SQLITE_OK) {
-            self->statement = 0;
+            Py_CLEAR(self->statement);
             goto error;
         }
     }
@@ -681,8 +681,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
             self->next_row = _pysqlite_fetch_one_row(self);
         } else if (rc == SQLITE_DONE && !multiple) {
             pysqlite_statement_reset(self->statement);
-            Py_DECREF(self->statement);
-            self->statement = 0;
+            Py_CLEAR(self->statement);
         }
 
         switch (statement_type) {
@@ -988,8 +987,7 @@ PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)
 
     if (self->statement) {
         (void)pysqlite_statement_reset(self->statement);
-        Py_DECREF(self->statement);
-        self->statement = 0;
+        Py_CLEAR(self->statement);
     }
 
     Py_INCREF(Py_None);

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*`
`545`	`545`	`}`
`546`	`546`	`rc = pysqlite_statement_create(self->statement, self->connection, operation);`
`547`	`547`	`if (rc != SQLITE_OK) {`
`548`		`- self->statement = 0;`
	`548`	`+ Py_CLEAR(self->statement);`
`549`	`549`	`goto error;`
`550`	`550`	`}`
`551`	`551`	`}`
`@@ -681,8 +681,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*`
`681`	`681`	`self->next_row = _pysqlite_fetch_one_row(self);`
`682`	`682`	`} else if (rc == SQLITE_DONE && !multiple) {`
`683`	`683`	`pysqlite_statement_reset(self->statement);`
`684`		`- Py_DECREF(self->statement);`
`685`		`- self->statement = 0;`
	`684`	`+ Py_CLEAR(self->statement);`
`686`	`685`	`}`
`687`	`686`
`688`	`687`	`switch (statement_type) {`
`@@ -988,8 +987,7 @@ PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)`
`988`	`987`
`989`	`988`	`if (self->statement) {`
`990`	`989`	`(void)pysqlite_statement_reset(self->statement);`
`991`		`- Py_DECREF(self->statement);`
`992`		`- self->statement = 0;`
	`990`	`+ Py_CLEAR(self->statement);`
`993`	`991`	`}`
`994`	`992`
`995`	`993`	`Py_INCREF(Py_None);`