mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #18408: Fix _pysqlite_fetch_one_row(), in debug mode, don't call

Browse source 
type_call() with an exception set
This commit is contained in:
Victor Stinner 2013-07-18 01:54:37 +02:00
parent ace47d7efd
commit 4abda5d5b0
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/_sqlite/cursor.c
View file

@ -339,6 +339,11 @@ PyObject* _pysqlite_fetch_one_row(pysqlite_Cursor* self)
if (self->connection->text_factory == (PyObject*)&PyUnicode_Type) { if (self->connection->text_factory == (PyObject*)&PyUnicode_Type) {
converted = PyUnicode_FromStringAndSize(val_str, nbytes); converted = PyUnicode_FromStringAndSize(val_str, nbytes);
if (!converted) { if (!converted) {
#ifdef Py_DEBUG
/* in debug mode, type_call() fails with an assertion
error if an exception is set when it is called */
PyErr_Clear();
#endif
colname = sqlite3_column_name(self->statement->st, i); colname = sqlite3_column_name(self->statement->st, i);
if (!colname) { if (!colname) {
colname = "<unknown column name>"; colname = "<unknown column name>";