From 10a525230fb18331dbcfd6a4a7248d76f55c331c Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 27 Jan 2020 11:02:05 +0900 Subject: Fix some memory leaks and improve restricted token handling on Windows The leaks have been detected by a Coverity run on Windows. No backpatch is done as the leaks are minor. While on it, make restricted token creation more consistent in its error handling by logging an error instead of a warning if missing advapi32.dll, which was missing in the NT4 days. Any modern platform should have this DLL around. Now, if the library is not there, an error is still reported back to the caller, and nothing is done do there is no behavior change done in this commit. Author: Ranier Vilela Discussion: https://postgr.es/m/CAEudQApa9MG0foPkgPX87fipk=vhnF2Xfg+CfUyR08h4R7Mywg@mail.gmail.com --- src/backend/libpq/auth.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/backend/libpq/auth.c') diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 511f8913939..bd8c7f58119 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -1387,6 +1387,13 @@ pg_SSPI_recvauth(Port *port) mtype = pq_getbyte(); if (mtype != 'p') { + if (sspictx != NULL) + { + DeleteSecurityContext(sspictx); + free(sspictx); + } + FreeCredentialsHandle(&sspicred); + /* Only log error if client didn't disconnect. */ if (mtype != EOF) ereport(ERROR, @@ -1402,6 +1409,12 @@ pg_SSPI_recvauth(Port *port) { /* EOF - pq_getmessage already logged error */ pfree(buf.data); + if (sspictx != NULL) + { + DeleteSecurityContext(sspictx); + free(sspictx); + } + FreeCredentialsHandle(&sspicred); return STATUS_ERROR; } @@ -2517,6 +2530,7 @@ InitializeLDAPConnection(Port *port, LDAP **ldap) (errmsg("could not load function _ldap_start_tls_sA in wldap32.dll"), errdetail("LDAP over SSL is not supported on this platform."))); ldap_unbind(*ldap); + FreeLibrary(ldaphandle); return STATUS_ERROR; } -- cgit v1.2.3