psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-30 04:33:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

callproc using a dict now has a type check to make sure the keys are strings.

Browse Source
This commit is contained in:
mrmilosz 2014-05-25 04:03:07 -04:00
parent 23d279945f
commit 1205bf9c2b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
psycopg/cursor_type.c
View File

@ -1024,6 +1024,7 @@ psyco_curs_callproc(cursorObject *self, PyObject *args)
PyObject *parameters = Py_None; PyObject *parameters = Py_None;
PyObject *operation = NULL; PyObject *operation = NULL;
PyObject *res = NULL; PyObject *res = NULL;
PyObject *parameter_name = NULL;
PyObject *parameter_names = NULL; PyObject *parameter_names = NULL;
if (!PyArg_ParseTuple(args, "s#|O", if (!PyArg_ParseTuple(args, "s#|O",
@ -1054,7 +1055,12 @@ psyco_curs_callproc(cursorObject *self, PyObject *args)
/* first we need to figure out how much space we need for the SQL */ /* first we need to figure out how much space we need for the SQL */
sl = procname_len + 17 + nparameters*5 - (nparameters ? 1 : 0); sl = procname_len + 17 + nparameters*5 - (nparameters ? 1 : 0);
for(i=0; i<nparameters; i++) { for(i=0; i<nparameters; i++) {
sl += strlen(Text_AsUTF8(PyList_GetItem(parameter_names, i))); parameter_name = PyList_GetItem(parameter_names, i);
if (!Text_Check(parameter_name)) {
PyErr_SetString(PyExc_TypeError, "argument 2 must have string keys if Dict");
goto exit;
}
sl += strlen(Text_AsUTF8(parameter_name));
} }
sql = (char*)PyMem_Malloc(sl); sql = (char*)PyMem_Malloc(sl);