Forward-port of commit 59184.
- Backported a workaround for a bug in SQLite 3.2.x/3.3.x versions where a statement recompilation with no bound parameters lead to a segfault - Backported a fix necessary because of an SQLite API change in version 3.5. This prevents segfaults when executing empty queries, like our test suite does
This commit is contained in:
parent
7a634e6027
commit
99b9df8e11
|
@ -237,7 +237,11 @@ int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params)
|
|||
*/
|
||||
#ifdef SQLITE_VERSION_NUMBER
|
||||
#if SQLITE_VERSION_NUMBER >= 3002002
|
||||
(void)sqlite3_transfer_bindings(self->st, new_st);
|
||||
/* The check for the number of parameters is necessary to not trigger a
|
||||
* bug in certain SQLite versions (experienced in 3.2.8 and 3.3.4). */
|
||||
if (sqlite3_bind_parameter_count(self->st) > 0) {
|
||||
(void)sqlite3_transfer_bindings(self->st, new_st);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
statement_bind_parameters(self, params);
|
||||
|
|
|
@ -28,9 +28,15 @@ int _sqlite_step_with_busyhandler(sqlite3_stmt* statement, pysqlite_Connection*
|
|||
{
|
||||
int rc;
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
rc = sqlite3_step(statement);
|
||||
Py_END_ALLOW_THREADS
|
||||
if (statement == NULL) {
|
||||
/* this is a workaround for SQLite 3.5 and later. it now apparently
|
||||
* returns NULL for "no-operation" statements */
|
||||
rc = SQLITE_OK;
|
||||
} else {
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
rc = sqlite3_step(statement);
|
||||
Py_END_ALLOW_THREADS
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue