lukehuang
diff --git a/‎_mysql.c
Copy file name to clipboardExpand all lines: _mysql.c
+5-8Lines changed: 5 additions & 8 deletions b/‎_mysql.c
Copy file name to clipboardExpand all lines: _mysql.c
+5-8Lines changed: 5 additions & 8 deletions
@@ -495,13 +495,10 @@ static int _mysql_ResultObject_traverse(
 	return 0;
 }
 
-static int _mysql_ResultObject_clear(
-	_mysql_ResultObject *self)
+static int _mysql_ResultObject_clear(_mysql_ResultObject *self)
 {
-	Py_XDECREF(self->converter);
-	self->converter = NULL;
-	Py_XDECREF(self->conn);
-	self->conn = NULL;
+	Py_CLEAR(self->converter);
+	Py_CLEAR(self->conn);
 	return 0;
 }
 
@@ -796,8 +793,7 @@ _mysql_ConnectionObject_close(
 		return NULL;
 	}
 	_mysql_ConnectionObject_clear(self);
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static char _mysql_ConnectionObject_affected_rows__doc__ [] =
@@ -2162,6 +2158,7 @@ _mysql_ConnectionObject_dealloc(
 		mysql_close(&(self->connection));
 		self->open = 0;
 	}
+	Py_CLEAR(self->converter);
 	MyFree(self);
 }
Original file line number	Diff line number	Diff line change
`@@ -495,13 +495,10 @@ static int _mysql_ResultObject_traverse(`
`495`	`495`	`return 0;`
`496`	`496`	`}`
`497`	`497`
`498`		`-static int _mysql_ResultObject_clear(`
`499`		`- _mysql_ResultObject *self)`
	`498`	`+static int _mysql_ResultObject_clear(_mysql_ResultObject *self)`
`500`	`499`	`{`
`501`		`- Py_XDECREF(self->converter);`
`502`		`- self->converter = NULL;`
`503`		`- Py_XDECREF(self->conn);`
`504`		`- self->conn = NULL;`
	`500`	`+ Py_CLEAR(self->converter);`
	`501`	`+ Py_CLEAR(self->conn);`
`505`	`502`	`return 0;`
`506`	`503`	`}`
`507`	`504`
`@@ -796,8 +793,7 @@ _mysql_ConnectionObject_close(`
`796`	`793`	`return NULL;`
`797`	`794`	`}`
`798`	`795`	`_mysql_ConnectionObject_clear(self);`
`799`		`- Py_INCREF(Py_None);`
`800`		`- return Py_None;`
	`796`	`+ Py_RETURN_NONE;`
`801`	`797`	`}`
`802`	`798`
`803`	`799`	`static char _mysql_ConnectionObject_affected_rows__doc__ [] =`
`@@ -2162,6 +2158,7 @@ _mysql_ConnectionObject_dealloc(`
`2162`	`2158`	`mysql_close(&(self->connection));`
`2163`	`2159`	`self->open = 0;`
`2164`	`2160`	`}`
	`2161`	`+ Py_CLEAR(self->converter);`
`2165`	`2162`	`MyFree(self);`
`2166`	`2163`	`}`
`2167`	`2164`