NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf019c02

committed

Improve handling of pthread_mutex_lock error case

We should really be reporting a useful error along with returninga valid return code if pthread_mutex_lock() throws an error forsome reason. Add that and back-patch to 9.0 as the prior patch.Pointed out by Alvaro Herrera

1 parentf310163 commitf019c02Copy full SHA for f019c02

File tree

1 file changed

+13

-1

lines changed

src/interfaces/libpq
- fe-secure.c

1 file changed

+13

-1

lines changed

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

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,11 @@ pqsecure_open_client(PGconn *conn)`
`262`	`262`
`263`	`263`	`#ifdefENABLE_THREAD_SAFETY`
`264`	`264`	`if (pthread_mutex_lock(&ssl_config_mutex))`
`265`		`-return-1;`
	`265`	`+{`
	`266`	`+printfPQExpBuffer(&conn->errorMessage,`
	`267`	`+libpq_gettext("unable to acquire mutex\n"));`
	`268`	`+returnPGRES_POLLING_FAILED;`
	`269`	`+}`
`266`	`270`	`#endif`
`267`	`271`	`/* Create a connection-specific SSL object */`
`268`	`272`	`if (!(conn->ssl=SSL_new(SSL_context))\|\|`
`@@ -1111,7 +1115,11 @@ initialize_SSL(PGconn *conn)`
`1111`	`1115`	`*/`
`1112`	`1116`	`#ifdefENABLE_THREAD_SAFETY`
`1113`	`1117`	`if (pthread_mutex_lock(&ssl_config_mutex))`
	`1118`	`+{`
	`1119`	`+printfPQExpBuffer(&conn->errorMessage,`
	`1120`	`+libpq_gettext("unable to acquire mutex\n"));`
`1114`	`1121`	`return-1;`
	`1122`	`+}`
`1115`	`1123`	`#endif`
`1116`	`1124`	`if (SSL_CTX_use_certificate_chain_file(SSL_context,fnbuf)!=1)`
`1117`	`1125`	`{`
`@@ -1325,7 +1333,11 @@ initialize_SSL(PGconn *conn)`
`1325`	`1333`
`1326`	`1334`	`#ifdefENABLE_THREAD_SAFETY`
`1327`	`1335`	`if (pthread_mutex_lock(&ssl_config_mutex))`
	`1336`	`+{`
	`1337`	`+printfPQExpBuffer(&conn->errorMessage,`
	`1338`	`+libpq_gettext("unable to acquire mutex\n"));`
`1328`	`1339`	`return-1;`
	`1340`	`+}`
`1329`	`1341`	`#endif`
`1330`	`1342`	`if (SSL_CTX_load_verify_locations(SSL_context,fnbuf,NULL)!=1)`
`1331`	`1343`	`{`

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!

Commitf019c02

File tree

1 file changed

1 file changed

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

0 commit comments