bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the Cursor object is uninitialized (GH-4333)

orenmn · vstinner · commit cd66d6d632b4 · 2017-11-08T01:57:02.000-08:00
diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
@@ -177,6 +177,9 @@ def __init__(self, con):
             pass
         except:
             self.fail("should have raised ProgrammingError")
+        with self.assertRaisesRegexp(sqlite.ProgrammingError,
+                                     r'^Base Cursor\.__init__ not called\.$'):
+            cur.close()
 
     def CheckConnectionConstructorCallCheck(self):
         """
diff --git a/Misc/NEWS.d/next/Library/2017-11-08-11-02-01.bpo-31764.gtlhKj.rst b/Misc/NEWS.d/next/Library/2017-11-08-11-02-01.bpo-31764.gtlhKj.rst
@@ -0,0 +1,2 @@
+Prevent a crash in ``sqlite3.Cursor.close()`` in case the ``Cursor`` object
+is uninitialized. Patch by Oren Milman.
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -1014,6 +1014,11 @@ PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args)
 
 PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)
 {
+    if (!self->connection) {
+        PyErr_SetString(pysqlite_ProgrammingError,
+                        "Base Cursor.__init__ not called.");
+        return NULL;
+    }
     if (!pysqlite_check_thread(self->connection) || !pysqlite_check_connection(self->connection)) {
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Prevent a crash in ``sqlite3.Cursor.close()`` in case the ``Cursor`` object
	`2`	`+is uninitialized. Patch by Oren Milman.`
Original file line number	Diff line number	Diff line change
`@@ -1014,6 +1014,11 @@ PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args)`
`1014`	`1014`
`1015`	`1015`	`PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)`
`1016`	`1016`	`{`
	`1017`	`+ if (!self->connection) {`
	`1018`	`+ PyErr_SetString(pysqlite_ProgrammingError,`
	`1019`	`+ "Base Cursor.__init__ not called.");`
	`1020`	`+ return NULL;`
	`1021`	`+ }`
`1017`	`1022`	`if (!pysqlite_check_thread(self->connection) \|\| !pysqlite_check_connection(self->connection)) {`
`1018`	`1023`	`return NULL;`
`1019`	`1024`	`}`