Forward port r64930.

avassalotti · avassalotti · commit 1839bac79658 · 2008-07-13T21:57:48.000Z
Fix one more case in cursor.c.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -944,19 +944,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;
         }
 
@@ -980,15 +977,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:
@@ -1011,15 +1006,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:
@@ -1042,15 +1035,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
@@ -1,6 +1,6 @@
 /* cursor.c - the cursor type
  *
- * Copyright (C) 2004-2007 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2004-2007 Gerhard Häring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *
@@ -529,7 +529,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;
         }
     }
@@ -602,7 +602,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;
         }
     }
@@ -711,8 +711,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) {
@@ -1013,8 +1012,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
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* cursor.c - the cursor type`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2004-2007 Gerhard Häring <[email protected]>`
	`3`	`+ * Copyright (C) 2004-2007 Gerhard Häring <[email protected]>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`
`@@ -529,7 +529,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*`
`529`	`529`	`}`
`530`	`530`	`rc = pysqlite_statement_create(self->statement, self->connection, operation);`
`531`	`531`	`if (rc != SQLITE_OK) {`
`532`		`- self->statement = 0;`
	`532`	`+ Py_CLEAR(self->statement);`
`533`	`533`	`goto error;`
`534`	`534`	`}`
`535`	`535`	`}`
`@@ -602,7 +602,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*`
`602`	`602`	`}`
`603`	`603`	`rc = pysqlite_statement_create(self->statement, self->connection, operation);`
`604`	`604`	`if (rc != SQLITE_OK) {`
`605`		`- self->statement = 0;`
	`605`	`+ Py_CLEAR(self->statement);`
`606`	`606`	`goto error;`
`607`	`607`	`}`
`608`	`608`	`}`
`@@ -711,8 +711,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*`
`711`	`711`	`self->next_row = _pysqlite_fetch_one_row(self);`
`712`	`712`	`} else if (rc == SQLITE_DONE && !multiple) {`
`713`	`713`	`pysqlite_statement_reset(self->statement);`
`714`		`- Py_DECREF(self->statement);`
`715`		`- self->statement = 0;`
	`714`	`+ Py_CLEAR(self->statement);`
`716`	`715`	`}`
`717`	`716`
`718`	`717`	`switch (statement_type) {`
`@@ -1013,8 +1012,7 @@ PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)`
`1013`	`1012`
`1014`	`1013`	`if (self->statement) {`
`1015`	`1014`	`(void)pysqlite_statement_reset(self->statement);`
`1016`		`- Py_DECREF(self->statement);`
`1017`		`- self->statement = 0;`
	`1015`	`+ Py_CLEAR(self->statement);`
`1018`	`1016`	`}`
`1019`	`1017`
`1020`	`1018`	`Py_INCREF(Py_None);`