languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-17 01:53:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use AsCharBuffer to get C strings out of Python strings.

Browse source
This commit is contained in:
Guido van Rossum 2007-05-09 23:37:01 +00:00
parent 63eac15927
commit 83857e3bf3
2 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Modules/_sqlite/cursor.c
View file

@ -409,8 +409,8 @@ PyObject* _pysqlite_fetch_one_row(pysqlite_Cursor* self)
PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args)
{
PyObject* operation;
PyObject* operation_bytestr = NULL;
char* operation_cstr;
const char* operation_cstr;
Py_ssize_t operation_len;
PyObject* parameters_list = NULL;
PyObject* parameters_iter = NULL;
PyObject* parameters = NULL;
@ -495,16 +495,8 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
rc = pysqlite_statement_reset(self->statement);
}
if (PyString_Check(operation)) {
operation_cstr = PyString_AsString(operation);
} else {
operation_bytestr = PyUnicode_AsUTF8String(operation);
if (!operation_bytestr) {
goto error;
}
operation_cstr = PyString_AsString(operation_bytestr);
}
if (PyObject_AsCharBuffer(operation, &operation_cstr, &operation_len) < 0)
goto error;
/* reset description and rowcount */
Py_DECREF(self->description);
@ -714,7 +706,6 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
}
error:
Py_XDECREF(operation_bytestr);
Py_XDECREF(parameters);
Py_XDECREF(parameters_iter);
Py_XDECREF(parameters_list);

28
Modules/_sqlite/statement.c
View file

@ -44,30 +44,20 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con
{
const char* tail;
int rc;
PyObject* sql_str;
char* sql_cstr;
const char* sql_cstr;
Py_ssize_t sql_cstr_len;
self->st = NULL;
self->in_use = 0;
if (PyString_Check(sql)) {
sql_str = sql;
Py_INCREF(sql_str);
} else if (PyUnicode_Check(sql)) {
sql_str = PyUnicode_AsUTF8String(sql);
if (!sql_str) {
rc = PYSQLITE_SQL_WRONG_TYPE;
return rc;
}
} else {
if (PyObject_AsCharBuffer(sql, &sql_cstr, &sql_cstr_len) < 0) {
rc = PYSQLITE_SQL_WRONG_TYPE;
return rc;
}
self->in_weakreflist = NULL;
self->sql = sql_str;
sql_cstr = PyString_AsString(sql_str);
Py_INCREF(sql);
self->sql = sql;
rc = sqlite3_prepare(connection->db,
sql_cstr,
@ -219,10 +209,14 @@ int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params)
{
const char* tail;
int rc;
char* sql_cstr;
const char* sql_cstr;
Py_ssize_t sql_len;
sqlite3_stmt* new_st;
sql_cstr = PyString_AsString(self->sql);
if (PyObject_AsCharBuffer(self->sql, &sql_cstr, &sql_len) < 0) {
rc = PYSQLITE_SQL_WRONG_TYPE;
return rc;
}
rc = sqlite3_prepare(self->db,
sql_cstr,