Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit83a7637

Browse files
committed
Reset conn->errorReported when PQrequestCancel sets errorMessage.
Oversight in commit618c167. This is mainly neatnik-ism, sinceif PQrequestCancel is used per its API contract, we should performpqClearConnErrorState before reaching any place that would consulterrorReported. But still, it seems like a bad idea to potentiallyleave errorReported pointing past errorMessage.len.
1 parent1c6d462 commit83a7637

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎src/interfaces/libpq/fe-connect.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4687,6 +4687,7 @@ PQrequestCancel(PGconn *conn)
46874687
"PQrequestCancel() -- connection is not open\n",
46884688
conn->errorMessage.maxlen);
46894689
conn->errorMessage.len=strlen(conn->errorMessage.data);
4690+
conn->errorReported=0;
46904691

46914692
return false;
46924693
}
@@ -4706,7 +4707,10 @@ PQrequestCancel(PGconn *conn)
47064707
}
47074708

47084709
if (!r)
4710+
{
47094711
conn->errorMessage.len=strlen(conn->errorMessage.data);
4712+
conn->errorReported=0;
4713+
}
47104714

47114715
returnr;
47124716
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp