psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 17:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed infinite loop when parsing '{' as array

Browse Source
This commit is contained in:
Daniele Varrazzo 2012-09-20 03:19:24 +01:00
parent 72e9cf7b6d
commit c7bee92160
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
psycopg/typecast_array.c
View File

@ -260,6 +260,10 @@ typecast_GENERIC_ARRAY_cast(const char *str, Py_ssize_t len, PyObject *curs)
PyErr_SetString(DataError, "array does not start with '{'"); PyErr_SetString(DataError, "array does not start with '{'");
return NULL; return NULL;
} }
if (str[1] == '\0') {
PyErr_SetString(DataError, "malformed array: '{'");
return NULL;
}
Dprintf("typecast_GENERIC_ARRAY_cast: str = '%s'," Dprintf("typecast_GENERIC_ARRAY_cast: str = '%s',"
" len = " FORMAT_CODE_PY_SSIZE_T, str, len); " len = " FORMAT_CODE_PY_SSIZE_T, str, len);

2
tests/test_types_basic.py
View File

@ -202,7 +202,7 @@ class TypesBasicTests(unittest.TestCase):
def testArrayMalformed(self): def testArrayMalformed(self):
curs = self.conn.cursor() curs = self.conn.cursor()
ss = ['', '{}}', '{' * 20 + '}' * 20] ss = ['', '{', '{}}', '{' * 20 + '}' * 20]
for s in ss: for s in ss:
self.assertRaises(psycopg2.DataError, self.assertRaises(psycopg2.DataError,
psycopg2.extensions.STRINGARRAY, b(s), curs) psycopg2.extensions.STRINGARRAY, b(s), curs)