diff options
| author | Gerhard Häring <gh@ghaering.de> | 2007-11-25 17:40:35 (GMT) |
|---|---|---|
| committer | Gerhard Häring <gh@ghaering.de> | 2007-11-25 17:40:35 (GMT) |
| commit | 14fbf29692ab4beaddca40fa39698e02bbf6aa08 (patch) | |
| tree | 5bc988575b2409d16902fd376f8e25b3f3b6247c /Modules/_sqlite/util.c | |
| parent | 664ad76a347cfa798b7229286706edd155c6aaa3 (diff) | |
| download | cpython-14fbf29692ab4beaddca40fa39698e02bbf6aa08.zip cpython-14fbf29692ab4beaddca40fa39698e02bbf6aa08.tar.gz cpython-14fbf29692ab4beaddca40fa39698e02bbf6aa08.tar.bz2 | |
- 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.
Diffstat (limited to 'Modules/_sqlite/util.c')
| -rw-r--r-- | Modules/_sqlite/util.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c index f5a7233..cbaee92 100644 --- a/Modules/_sqlite/util.c +++ b/Modules/_sqlite/util.c @@ -29,9 +29,15 @@ int _sqlite_step_with_busyhandler(sqlite3_stmt* statement, Connection* connectio { 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; } |