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

Commite37e9a6

Browse files
committed
Add missing bad-PGconn guards in libpq entry points.
There's a convention that externally-visible libpq functions shouldcheck for a NULL PGconn pointer, and fail gracefully instead ofcrashing. PQflush() and PQisnonblocking() didn't get that memothough. Also add a similar check to PQdefaultSSLKeyPassHook_OpenSSL;while it's not clear that ordinary usage could reach that with anull conn pointer, it's cheap enough to check, so let's be consistent.Daniele Varrazzo and Tom LaneDiscussion:https://postgr.es/m/CA+mi_8Zm_mVVyW1iNFgyMd9Oh0Nv8-F+7Y3-BqwMgTMHuo_h2Q@mail.gmail.com
1 parentbcf7eb9 commite37e9a6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3267,6 +3267,8 @@ PQsetnonblocking(PGconn *conn, int arg)
32673267
int
32683268
PQisnonblocking(constPGconn*conn)
32693269
{
3270+
if (!conn||conn->status==CONNECTION_BAD)
3271+
return false;
32703272
returnpqIsnonblocking(conn);
32713273
}
32723274

@@ -3286,6 +3288,8 @@ PQisthreadsafe(void)
32863288
int
32873289
PQflush(PGconn*conn)
32883290
{
3291+
if (!conn||conn->status==CONNECTION_BAD)
3292+
return-1;
32893293
returnpqFlush(conn);
32903294
}
32913295

‎src/interfaces/libpq/fe-secure-openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@ my_SSL_set_fd(PGconn *conn, int fd)
17471747
int
17481748
PQdefaultSSLKeyPassHook_OpenSSL(char*buf,intsize,PGconn*conn)
17491749
{
1750-
if (conn->sslpassword)
1750+
if (conn&&conn->sslpassword)
17511751
{
17521752
if (strlen(conn->sslpassword)+1>size)
17531753
fprintf(stderr,libpq_gettext("WARNING: sslpassword truncated\n"));

0 commit comments

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