mig5/bouquin-sqlcipher4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix case-insensitive string comparison in sqlite3.Row indexing.

Browse source
This commit is contained in:
Charles Leifer 2019-09-19 09:26:57 -05:00
parent 102ec435ff
commit a6b7b19bc9
2 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/row.c
View file

@ -76,16 +76,38 @@ PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx)
return item;
}
static int
equal_ignore_case(PyObject *left, PyObject *right)
{
int eq = PyObject_RichCompareBool(left, right, Py_EQ);
if (eq) {
return eq;
}
if (!PyUnicode_Check(left) || !PyUnicode_Check(right)) {
return 0;
}
if (!PyUnicode_IS_ASCII(left) || !PyUnicode_IS_ASCII(right)) {
return 0;
}
Py_ssize_t len = PyUnicode_GET_LENGTH(left);
if (PyUnicode_GET_LENGTH(right) != len) {
return 0;
}
const Py_UCS1 *p1 = PyUnicode_1BYTE_DATA(left);
const Py_UCS1 *p2 = PyUnicode_1BYTE_DATA(right);
for (; len; len--, p1++, p2++) {
if (Py_TOLOWER(*p1) != Py_TOLOWER(*p2)) {
return 0;
}
}
return 1;
}
PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
{
Py_ssize_t _idx;
const char *key;
Py_ssize_t nitems, i;
const char *compare_key;
const char *p1;
const char *p2;
PyObject* item;
if (PyLong_Check(idx)) {
@ -98,44 +120,23 @@ PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
Py_XINCREF(item);
return item;
} else if (PyUnicode_Check(idx)) {
key = PyUnicode_AsUTF8(idx);
if (key == NULL)
return NULL;
nitems = PyTuple_Size(self->description);
for (i = 0; i < nitems; i++) {
PyObject *obj;
obj = PyTuple_GET_ITEM(self->description, i);
obj = PyTuple_GET_ITEM(obj, 0);
compare_key = PyUnicode_AsUTF8(obj);
if (!compare_key) {
int eq = equal_ignore_case(idx, obj);
if (eq < 0) {
return NULL;
}
p1 = key;
p2 = compare_key;
while (1) {
if ((*p1 == (char)0) || (*p2 == (char)0)) {
break;
}
if ((*p1 | 0x20) != (*p2 | 0x20)) {
break;
}
p1++;
p2++;
}
if ((*p1 == (char)0) && (*p2 == (char)0)) {
if (eq) {
/* found item */
item = PyTuple_GetItem(self->data, i);
Py_INCREF(item);
return item;
}
}
PyErr_SetString(PyExc_IndexError, "No item with that key");