Merge ac7d33d into 802da09

Author: molotkov-and

ydb/core/security/ldap_auth_provider/ldap_auth_provider.cpp

@@ -321,6 +321,8 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
             response.Status = NKikimrLdap::ErrorToStatus(result);
             response.Error = {.Message = ERROR_MESSAGE, .LogMessage = logErrorMessage, .Retryable = NKikimrLdap::IsRetryableError(result)};
             LDAP_LOG_D(logErrorMessage);
+            NKikimrLdap::MsgFree(searchMessage);
+            searchMessage = nullptr;
             return response;
         }
         const int countEntries = NKikimrLdap::CountEntries(request.Ld, searchMessage);
@@ -336,6 +338,7 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
             response.Error = {.Message = ERROR_MESSAGE, .LogMessage = logErrorMessage, .Retryable = false};
             response.Status = TEvLdapAuthProvider::EStatus::UNAUTHORIZED;
             NKikimrLdap::MsgFree(searchMessage);
+            searchMessage = nullptr;
             LDAP_LOG_D(logErrorMessage);
             return response;
         }
@@ -357,11 +360,14 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
         LDAPMessage* searchMessage = nullptr;
         int result = NKikimrLdap::Search(ld, Settings.GetBaseDn(), NKikimrLdap::EScope::SUBTREE, filter, NKikimrLdap::noAttributes, 0, &searchMessage);
         if (!NKikimrLdap::IsSuccess(result)) {
+            NKikimrLdap::MsgFree(searchMessage);
+            searchMessage = nullptr;
             return {};
         }
         const int countEntries = NKikimrLdap::CountEntries(ld, searchMessage);
         if (countEntries == 0) {
             NKikimrLdap::MsgFree(searchMessage);
+            searchMessage = nullptr;
             return {};
         }
         std::vector<TString> groups;
@@ -373,6 +379,7 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
             dn = nullptr;
         }
         NKikimrLdap::MsgFree(searchMessage);
+        searchMessage = nullptr;
         return groups;
     }
 
@@ -403,10 +410,13 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
             LDAPMessage* searchMessage = nullptr;
             int result = NKikimrLdap::Search(ld, Settings.GetBaseDn(), NKikimrLdap::EScope::SUBTREE, filter, RequestedAttributes, 0, &searchMessage);
             if (!NKikimrLdap::IsSuccess(result)) {
+                NKikimrLdap::MsgFree(searchMessage);
+                searchMessage = nullptr;
                 return;
             }
             if (NKikimrLdap::CountEntries(ld, searchMessage) == 0) {
                 NKikimrLdap::MsgFree(searchMessage);
+                searchMessage = nullptr;
                 return;
             }
             for (LDAPMessage* groupEntry = NKikimrLdap::FirstEntry(ld, searchMessage); groupEntry != nullptr; groupEntry = NKikimrLdap::NextEntry(ld, groupEntry)) {
@@ -429,6 +439,7 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
                 }
             }
             NKikimrLdap::MsgFree(searchMessage);
+            searchMessage = nullptr;
         }
     }