NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitddf927f

committed

Fix misuse of an integer as a bool.

pgtls_read_pending is declared to return bool, but what the underlyingSSL_pending function returns is a count of available bytes.This is actually somewhat harmless if we're using C99 bools, but inthe back branches it's a live bug: if the available-bytes count happenedto 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 misbehaveas well. The net effect is that when using SSL, libpq might blockwaiting for data even though some has already been received.Broken by careless refactoring in commit4e86f1b, so back-patchto 9.5 where that came in.Per bug #15802 from David Binderman.Discussion:https://postgr.es/m/15802-f0911a97f0346526@postgresql.org

1 parentcc86694 commitddf927fCopy full SHA for ddf927f

File tree

2 files changed

-2

lines changed

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

2 files changed

-2

lines changed

`‎src/interfaces/libpq/fe-misc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,7 @@ pqSocketCheck(PGconn *conn, int forRead, int forWrite, time_t end_time)`
`1094`	`1094`
`1095`	`1095`	`#ifdefUSE_SSL`
`1096`	`1096`	`/* Check for SSL library buffering read bytes */`
`1097`		`-if (forRead&&conn->ssl_in_use&&pgtls_read_pending(conn)>0)`
	`1097`	`+if (forRead&&conn->ssl_in_use&&pgtls_read_pending(conn))`
`1098`	`1098`	`{`
`1099`	`1099`	`/* short-circuit the select */`
`1100`	`1100`	`return1;`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ pgtls_read(PGconn conn, void ptr, size_t len)`
`264`	`264`	`bool`
`265`	`265`	`pgtls_read_pending(PGconn*conn)`
`266`	`266`	`{`
`267`		`-returnSSL_pending(conn->ssl);`
	`267`	`+returnSSL_pending(conn->ssl)>0;`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`ssize_t`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitddf927f

File tree

2 files changed

2 files changed

`‎src/interfaces/libpq/fe-misc.c`

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

0 commit comments