Commit 83857e3b authored by Guido van Rossum's avatar Guido van Rossum

Use AsCharBuffer to get C strings out of Python strings.

parent 63eac159
...@@ -409,8 +409,8 @@ PyObject* _pysqlite_fetch_one_row(pysqlite_Cursor* self) ...@@ -409,8 +409,8 @@ PyObject* _pysqlite_fetch_one_row(pysqlite_Cursor* self)
PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args) PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args)
{ {
PyObject* operation; PyObject* operation;
PyObject* operation_bytestr = NULL; const char* operation_cstr;
char* operation_cstr; Py_ssize_t operation_len;
PyObject* parameters_list = NULL; PyObject* parameters_list = NULL;
PyObject* parameters_iter = NULL; PyObject* parameters_iter = NULL;
PyObject* parameters = NULL; PyObject* parameters = NULL;
...@@ -495,16 +495,8 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* ...@@ -495,16 +495,8 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
rc = pysqlite_statement_reset(self->statement); rc = pysqlite_statement_reset(self->statement);
} }
if (PyString_Check(operation)) { if (PyObject_AsCharBuffer(operation, &operation_cstr, &operation_len) < 0)
operation_cstr = PyString_AsString(operation); goto error;
} else {
operation_bytestr = PyUnicode_AsUTF8String(operation);
if (!operation_bytestr) {
goto error;
}
operation_cstr = PyString_AsString(operation_bytestr);
}
/* reset description and rowcount */ /* reset description and rowcount */
Py_DECREF(self->description); Py_DECREF(self->description);
...@@ -714,7 +706,6 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* ...@@ -714,7 +706,6 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
} }
error: error:
Py_XDECREF(operation_bytestr);
Py_XDECREF(parameters); Py_XDECREF(parameters);
Py_XDECREF(parameters_iter); Py_XDECREF(parameters_iter);
Py_XDECREF(parameters_list); Py_XDECREF(parameters_list);
......
...@@ -44,30 +44,20 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con ...@@ -44,30 +44,20 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con
{ {
const char* tail; const char* tail;
int rc; int rc;
PyObject* sql_str; const char* sql_cstr;
char* sql_cstr; Py_ssize_t sql_cstr_len;
self->st = NULL; self->st = NULL;
self->in_use = 0; self->in_use = 0;
if (PyString_Check(sql)) { if (PyObject_AsCharBuffer(sql, &sql_cstr, &sql_cstr_len) < 0) {
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 {
rc = PYSQLITE_SQL_WRONG_TYPE; rc = PYSQLITE_SQL_WRONG_TYPE;
return rc; return rc;
} }
self->in_weakreflist = NULL; self->in_weakreflist = NULL;
self->sql = sql_str; Py_INCREF(sql);
self->sql = sql;
sql_cstr = PyString_AsString(sql_str);
rc = sqlite3_prepare(connection->db, rc = sqlite3_prepare(connection->db,
sql_cstr, sql_cstr,
...@@ -219,10 +209,14 @@ int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params) ...@@ -219,10 +209,14 @@ int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* params)
{ {
const char* tail; const char* tail;
int rc; int rc;
char* sql_cstr; const char* sql_cstr;
Py_ssize_t sql_len;
sqlite3_stmt* new_st; 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, rc = sqlite3_prepare(self->db,
sql_cstr, sql_cstr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment