traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

"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.
This commit is contained in:
Guido van Rossum 2007-08-29 03:34:29 +00:00
parent 625cbf28ee
commit fa9a121952
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_sqlite/cursor.c
View File

@ -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);

8
Modules/_sqlite/statement.c
View File

@ -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,