@@ -24,6 +24,8 @@

import datetime

import unittest

import sqlite3 as sqlite

import weakref

from test import support

class RegressionTests(unittest.TestCase):

def setUp(self):

@@ -376,6 +378,22 @@ def CheckCommitCursorReset(self):

counter += 1

self.assertEqual(counter, 3, "should have returned exactly three rows")

def CheckBpo31770(self):

"""

The interpreter shouldn't crash in case Cursor.__init__() is called

more than once.

"""

def callback(*args):

pass

con = sqlite.connect(":memory:")

cur = sqlite.Cursor(con)

ref = weakref.ref(cur, callback)

cur.__init__(con)

del cur

# The interpreter shouldn't crash when ref is collected.

del ref

support.gc_collect()

def suite():

regression_suite = unittest.makeSuite(RegressionTests, "Check")

@@ -0,0 +1,2 @@

Prevent a crash when calling the ``__init__()`` method of a

``sqlite3.Cursor`` object more than once. Patch by Oren Milman.

@@ -39,21 +39,20 @@ static int pysqlite_cursor_init(pysqlite_Cursor* self, PyObject* args, PyObject*

}

Py_INCREF(connection);

self->connection = connection;

self->statement = NULL;

self->next_row = NULL;

self->in_weakreflist = NULL;

Py_XSETREF(self->connection, connection);

Py_CLEAR(self->statement);

Py_CLEAR(self->next_row);

self->row_cast_map = PyList_New(0);

Py_XSETREF(self->row_cast_map, PyList_New(0));

if (!self->row_cast_map) {

return -1;

}

Py_INCREF(Py_None);

self->description = Py_None;

Py_XSETREF(self->description, Py_None);

Py_INCREF(Py_None);

self->lastrowid= Py_None;

Py_XSETREF(self->lastrowid, Py_None);

self->arraysize = 1;

self->closed = 0;

@@ -62,7 +61,7 @@ static int pysqlite_cursor_init(pysqlite_Cursor* self, PyObject* args, PyObject*

self->rowcount = -1L;

Py_INCREF(Py_None);

self->row_factory = Py_None;

Py_XSETREF(self->row_factory, Py_None);

if (!pysqlite_check_thread(self->connection)) {

return -1;