database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-11 10:01:57 +03:00
Code Activity

Reset conn->errorReported when PQrequestCancel sets errorMessage.

Browse Source 
Oversight in commit 618c16707.  This is mainly neatnik-ism, since
if PQrequestCancel is used per its API contract, we should perform
pqClearConnErrorState before reaching any place that would consult
errorReported.  But still, it seems like a bad idea to potentially
leave errorReported pointing past errorMessage.len.
This commit is contained in:
Tom Lane
2022-02-20 15:02:41 -05:00
parent 1c6d462939
commit 83a7637e2c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-connect.c
View File

@ -4687,6 +4687,7 @@ PQrequestCancel(PGconn *conn)
"PQrequestCancel() -- connection is not open\n", "PQrequestCancel() -- connection is not open\n",
conn->errorMessage.maxlen); conn->errorMessage.maxlen);
conn->errorMessage.len = strlen(conn->errorMessage.data); conn->errorMessage.len = strlen(conn->errorMessage.data);
conn->errorReported = 0;
return false; return false;
} }
@ -4706,7 +4707,10 @@ PQrequestCancel(PGconn *conn)
} }
if (!r) if (!r)
{
conn->errorMessage.len = strlen(conn->errorMessage.data); conn->errorMessage.len = strlen(conn->errorMessage.data);
conn->errorReported = 0;
}
return r; return r;
} }