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

Check return value of PQsocket

Browse Source 
When connection is closed by the server, we might get -1 there.
This commit is contained in:
Oleksandr Shulgin 2015-07-02 14:39:51 +02:00
parent dab41c699a
commit 9c1f2acf3e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
psycopg/pqpath.c
View File

@ -1689,13 +1689,10 @@ _pq_copy_both_v3(cursorObject *curs)
{ {
PyObject *msg, *tmp = NULL; PyObject *msg, *tmp = NULL;
PyObject *write_func = NULL; PyObject *write_func = NULL;
int ret = -1; int is_text, fd, sel, ret = -1;
int is_text;
PGconn *pgconn; PGconn *pgconn;
fd_set fds; fd_set fds;
struct timeval curr_time, ping_time, time_diff; struct timeval curr_time, ping_time, time_diff;
int sel;
if (!curs->copyfile) { if (!curs->copyfile) {
psyco_set_error(ProgrammingError, curs, psyco_set_error(ProgrammingError, curs,
@ -1724,8 +1721,14 @@ _pq_copy_both_v3(cursorObject *curs)
else if (msg == Py_None) { else if (msg == Py_None) {
Py_DECREF(msg); Py_DECREF(msg);
fd = PQsocket(pgconn);
if (fd < 0) {
pq_raise(curs->conn, curs, NULL);
goto exit;
}
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(PQsocket(pgconn), &fds); FD_SET(fd, &fds);
gettimeofday(&curr_time, NULL); gettimeofday(&curr_time, NULL);
@ -1736,7 +1739,7 @@ _pq_copy_both_v3(cursorObject *curs)
timersub(&ping_time, &curr_time, &time_diff); timersub(&ping_time, &curr_time, &time_diff);
if (time_diff.tv_sec > 0) { if (time_diff.tv_sec > 0) {
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
sel = select(PQsocket(pgconn) + 1, &fds, NULL, NULL, &time_diff); sel = select(fd + 1, &fds, NULL, NULL, &time_diff);
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
} }
else { else {