commit 8699950b04343afe37e9dcdce87028ba0f56827b
author Victor Stinner <victor.stinner@haypocalc.com> Wed May 19 01:27:23 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Wed May 19 01:27:23 2010 +0000
tree eae09cfadd1474a6cdb5a5b23f8d0bf03ae239c2
parent f6c578328c419f25dea91425479a6ceeb891b04d

Issue #6697: Check that _PyUnicode_AsString() result is not NULL in _sqlite

Strip also some trailing spaces

Modules/_sqlite/statement.c

diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 48e039b..c040290 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -130,7 +130,10 @@
             break;
         case TYPE_UNICODE:
             string = _PyUnicode_AsString(parameter);
-            rc = sqlite3_bind_text(self->st, pos, string, -1, SQLITE_TRANSIENT);
+            if (string != NULL)
+                rc = sqlite3_bind_text(self->st, pos, string, -1, SQLITE_TRANSIENT);
+            else
+                rc = -1;
             break;
         case TYPE_BUFFER:
             if (PyObject_AsCharBuffer(parameter, &buffer, &buflen) == 0) {