From 4abda5d5b08f5ed09f4c72e7ba9726f89aaf8780 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 18 Jul 2013 01:54:37 +0200
Subject: Issue #18408: Fix _pysqlite_fetch_one_row(), in debug mode, don't
 call type_call() with an exception set

---
 Modules/_sqlite/cursor.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Modules/_sqlite/cursor.c')

diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 49994158db..8f9bd699a6 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -339,6 +339,11 @@ PyObject* _pysqlite_fetch_one_row(pysqlite_Cursor* self)
                 if (self->connection->text_factory == (PyObject*)&PyUnicode_Type) {
                     converted = PyUnicode_FromStringAndSize(val_str, nbytes);
                     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);
                         if (!colname) {
                             colname = "<unknown column name>";
-- 
cgit v1.2.1