[PATCH v2 0/1] MR3002: wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build).

[Alex Henrie (＠alexhenrie)]

--
  v2: wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build).

https://gitlab.winehq.org/wine/wine/-/merge_requests/3002

[PATCH v2 1/1] wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build).

[Alex Henrie]

From: Alex Henrie

---
 dlls/wldap32/init.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c
index 519466da1ee..c5b11a4de28 100644
--- a/dlls/wldap32/init.c
+++ b/dlls/wldap32/init.c
@@ -450,14 +450,12 @@ ULONG CDECL ldap_start_tls_sW( LDAP *ld, ULONG *retval, LDAPMessage **result, LD
     }

if (!ld) return ~0u;
+    if (CONNECTED(ld)) return WLDAP32_LDAP_LOCAL_ERROR;

if (serverctrls && !(serverctrlsU = controlarrayWtoU( serverctrls ))) goto exit;
     if (clientctrls && !(clientctrlsU = controlarrayWtoU( clientctrls ))) goto exit;
-    else
-    {
-        if (CONNECTED(ld)) return WLDAP32_LDAP_LOCAL_ERROR;
-        ret = map_error( ldap_start_tls_s( CTX(ld), serverctrlsU, clientctrlsU ) );
-    }
+
+    ret = map_error( ldap_start_tls_s( CTX(ld), serverctrlsU, clientctrlsU ) );

exit:
     controlarrayfreeU( serverctrlsU );

[PATCH v2 0/1] MR3002: wldap32: Fix memory leak on error path in ldap_start_tls_sW (scan-build). - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.