psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-07-15 02:32:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check errors when populating encodings map

Browse Source
This commit is contained in:
Daniele Varrazzo 2012-02-23 18:28:30 +00:00
parent dca6cffd6e
commit 026899e0c1
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
psycopg/psycopgmodule.c
View File

@ -326,15 +326,27 @@ static encodingPair encodings[] = {
{NULL, NULL} {NULL, NULL}
}; };
static void psyco_encodings_fill(PyObject *dict) /* Initialize the encodings table.
*
* Return 0 on success, else -1 and set an exception.
*/
static int psyco_encodings_fill(PyObject *dict)
{ {
PyObject *value = NULL;
encodingPair *enc; encodingPair *enc;
int rv = -1;
for (enc = encodings; enc->pgenc != NULL; enc++) { for (enc = encodings; enc->pgenc != NULL; enc++) {
PyObject *value = Text_FromUTF8(enc->pyenc); if (!(value = Text_FromUTF8(enc->pyenc))) { goto exit; }
PyDict_SetItemString(dict, enc->pgenc, value); if (0 != PyDict_SetItemString(dict, enc->pgenc, value)) { goto exit; }
Py_DECREF(value); Py_CLEAR(value);
} }
rv = 0;
exit:
Py_XDECREF(value);
return rv;
} }
/* psyco_errors_init, psyco_errors_fill (callable from C) /* psyco_errors_init, psyco_errors_fill (callable from C)
@ -905,8 +917,8 @@ INIT_MODULE(_psycopg)(void)
#endif #endif
/* other mixed initializations of module-level variables */ /* other mixed initializations of module-level variables */
psycoEncodings = PyDict_New(); if (!(psycoEncodings = PyDict_New())) { goto exit; }
psyco_encodings_fill(psycoEncodings); if (0 != psyco_encodings_fill(psycoEncodings)) { goto exit; }
psyco_null = Bytes_FromString("NULL"); psyco_null = Bytes_FromString("NULL");
psyco_DescriptionType = psyco_make_description_type(); psyco_DescriptionType = psyco_make_description_type();