github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 08:06:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

If PQgetCancel() returns NULL we should also return false.

Browse Source 
Noted by Andres Freund.
This commit is contained in:
Jaime Casanova
2013-07-12 08:01:01 -05:00
parent 2bc8044fda
commit 2e7acf03c4
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dbutils.c
View File

@@ -443,22 +443,22 @@ CancelQuery(PGconn *conn, int timeout)
pgcancel = PQgetCancel(conn); pgcancel = PQgetCancel(conn);
if (pgcancel != NULL) if (pgcancel == NULL)
{ return false;
/*
* PQcancel can only return 0 if socket()/connect()/send()
* fails, in any of those cases we can assume something
* bad happened to the connection
*/
if (PQcancel(pgcancel, errbuf, ERRBUFF_SIZE) == 0)
{
log_warning(_("Can't stop current query: %s\n"), errbuf);
PQfreeCancel(pgcancel);
return false;
}
/*
* PQcancel can only return 0 if socket()/connect()/send()
* fails, in any of those cases we can assume something
* bad happened to the connection
*/
if (PQcancel(pgcancel, errbuf, ERRBUFF_SIZE) == 0)
{
log_warning(_("Can't stop current query: %s\n"), errbuf);
PQfreeCancel(pgcancel); PQfreeCancel(pgcancel);
return false;
} }
PQfreeCancel(pgcancel);
return true; return true;
} }