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

Fixed detection of empty error from pq_raise

Browse Source 
Avoid a system error in case err is set to an empty string.
This commit is contained in:
Daniele Varrazzo 2011-03-04 20:20:56 +00:00
parent 4a8b5f98f3
commit f1d69f6dec
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
psycopg/pqpath.c
View File

@ -172,16 +172,19 @@ pq_raise(connectionObject *conn, cursorObject *curs, PGresult *pgres)
if (pgres) { if (pgres) {
err = PQresultErrorMessage(pgres); err = PQresultErrorMessage(pgres);
if (err != NULL) { if (err != NULL) {
Dprintf("pq_raise: PQresultErrorMessage: err=%s", err);
code = PQresultErrorField(pgres, PG_DIAG_SQLSTATE); code = PQresultErrorField(pgres, PG_DIAG_SQLSTATE);
} }
} }
if (err == NULL) if (err == NULL) {
err = PQerrorMessage(conn->pgconn); err = PQerrorMessage(conn->pgconn);
Dprintf("pq_raise: PQerrorMessage: err=%s", err);
}
/* if the is no error message we probably called pq_raise without reason: /* if the is no error message we probably called pq_raise without reason:
we need to set an exception anyway because the caller will probably we need to set an exception anyway because the caller will probably
raise and a meaningful message is better than an empty one */ raise and a meaningful message is better than an empty one */
if (err == NULL) { if (err == NULL || err[0] == '\0') {
PyErr_SetString(Error, "psycopg went psycotic without error set"); PyErr_SetString(Error, "psycopg went psycotic without error set");
return; return;
} }
@ -194,6 +197,7 @@ pq_raise(connectionObject *conn, cursorObject *curs, PGresult *pgres)
/* try to remove the initial "ERROR: " part from the postgresql error */ /* try to remove the initial "ERROR: " part from the postgresql error */
err2 = strip_severity(err); err2 = strip_severity(err);
Dprintf("pq_raise: err2=%s", err2);
psyco_set_error(exc, curs, err2, err, code); psyco_set_error(exc, curs, err2, err, code);
} }