diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-29 03:34:29 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-29 03:34:29 (GMT) |
| commit | fa9a121952db01168e8d131549680d8bb8e9ddb7 (patch) | |
| tree | d5b34d56a98e011f5ad8593ba404882c3d2c62e1 | |
| parent | 625cbf28eeeed3f2d8afffa6c442f10d58ae6607 (diff) | |
| download | cpython-fa9a121952db01168e8d131549680d8bb8e9ddb7.zip cpython-fa9a121952db01168e8d131549680d8bb8e9ddb7.tar.gz cpython-fa9a121952db01168e8d131549680d8bb8e9ddb7.tar.bz2 | |
"Fix" a few places that were using PyObject_AsCharBuffer() to convert a string
(PyUnicode these days) to a char* + length. The fix consists of calling
PyUnicode_AsString() and strlen(). This is not ideal, but AsCharBuffer()
is definitely not the API to use.
| -rw-r--r-- | Modules/_sqlite/cursor.c | 4 | ||||
| -rw-r--r-- | Modules/_sqlite/statement.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 9c295a6..55a1ffc 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -497,8 +497,10 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* rc = pysqlite_statement_reset(self->statement); } - if (PyObject_AsCharBuffer(operation, &operation_cstr, &operation_len) < 0) + operation_cstr = PyUnicode_AsString(operation); + if (operation == NULL) goto error; + operation_len = strlen(operation_cstr); /* XXX */ /* reset description and rowcount */ Py_DECREF(self->description); diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c index b80b955..a5801d6 100644 --- a/Modules/_sqlite/statement.c +++ b/Modules/_sqlite/statement.c @@ -50,10 +50,12 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con self->st = NULL; self->in_use = 0; - if (PyObject_AsCharBuffer(sql, &sql_cstr, &sql_cstr_len) < 0) { + sql_cstr = PyUnicode_AsString(sql); + if (sql_cstr == NULL) { rc = PYSQLITE_SQL_WRONG_TYPE; return rc; } + sql_cstr_len = strlen(sql_cstr); /* XXX */ self->in_weakreflist = NULL; Py_INCREF(sql); @@ -214,10 +216,12 @@ int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params) Py_ssize_t sql_len; sqlite3_stmt* new_st; - if (PyObject_AsCharBuffer(self->sql, &sql_cstr, &sql_len) < 0) { + sql_cstr = PyUnicode_AsString(self->sql); + if (sql_cstr == NULL) { rc = PYSQLITE_SQL_WRONG_TYPE; return rc; } + sql_len = strlen(sql_cstr); /* XXXX */ rc = sqlite3_prepare(self->db, sql_cstr, |