database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Fix misuse of an integer as a bool.

Browse Source 
pgtls_read_pending is declared to return bool, but what the underlying
SSL_pending function returns is a count of available bytes.

This is actually somewhat harmless if we're using C99 bools, but in
the back branches it's a live bug: if the available-bytes count happened
to be a multiple of 256, it would get converted to a zero char value.
On machines where char is signed, counts of 128 and up could misbehave
as well.  The net effect is that when using SSL, libpq might block
waiting for data even though some has already been received.

Broken by careless refactoring in commit 4e86f1b16, so back-patch
to 9.5 where that came in.

Per bug #15802 from David Binderman.

Discussion: https://postgr.es/m/15802-f0911a97f0346526@postgresql.org
This commit is contained in:
Tom Lane 2019-05-13 10:53:19 -04:00
parent cc866941ad
commit ddf927fb13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/libpq/fe-misc.c
View File

@ -1094,7 +1094,7 @@ pqSocketCheck(PGconn *conn, int forRead, int forWrite, time_t end_time)
#ifdef USE_SSL
/* Check for SSL library buffering read bytes */
if (forRead && conn->ssl_in_use && pgtls_read_pending(conn) > 0)
if (forRead && conn->ssl_in_use && pgtls_read_pending(conn))
{
/* short-circuit the select */
return 1;

2
src/interfaces/libpq/fe-secure-openssl.c
View File

@ -264,7 +264,7 @@ rloop:
bool
pgtls_read_pending(PGconn *conn)
{
return SSL_pending(conn->ssl);
return SSL_pending(conn->ssl) > 0;
}
ssize_t