Skip to content

Commit 5ffcbc3

Browse files
committed
Revert "Set pointer as nullptr after free memory"
This reverts commit ac7d33d.
1 parent ac7d33d commit 5ffcbc3

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

ydb/core/security/ldap_auth_provider/ldap_auth_provider.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
322322
response.Error = {.Message = ERROR_MESSAGE, .LogMessage = logErrorMessage, .Retryable = NKikimrLdap::IsRetryableError(result)};
323323
LDAP_LOG_D(logErrorMessage);
324324
NKikimrLdap::MsgFree(searchMessage);
325-
searchMessage = nullptr;
326325
return response;
327326
}
328327
const int countEntries = NKikimrLdap::CountEntries(request.Ld, searchMessage);
@@ -338,7 +337,6 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
338337
response.Error = {.Message = ERROR_MESSAGE, .LogMessage = logErrorMessage, .Retryable = false};
339338
response.Status = TEvLdapAuthProvider::EStatus::UNAUTHORIZED;
340339
NKikimrLdap::MsgFree(searchMessage);
341-
searchMessage = nullptr;
342340
LDAP_LOG_D(logErrorMessage);
343341
return response;
344342
}
@@ -361,13 +359,11 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
361359
int result = NKikimrLdap::Search(ld, Settings.GetBaseDn(), NKikimrLdap::EScope::SUBTREE, filter, NKikimrLdap::noAttributes, 0, &searchMessage);
362360
if (!NKikimrLdap::IsSuccess(result)) {
363361
NKikimrLdap::MsgFree(searchMessage);
364-
searchMessage = nullptr;
365362
return {};
366363
}
367364
const int countEntries = NKikimrLdap::CountEntries(ld, searchMessage);
368365
if (countEntries == 0) {
369366
NKikimrLdap::MsgFree(searchMessage);
370-
searchMessage = nullptr;
371367
return {};
372368
}
373369
std::vector<TString> groups;
@@ -379,7 +375,6 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
379375
dn = nullptr;
380376
}
381377
NKikimrLdap::MsgFree(searchMessage);
382-
searchMessage = nullptr;
383378
return groups;
384379
}
385380

@@ -411,12 +406,10 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
411406
int result = NKikimrLdap::Search(ld, Settings.GetBaseDn(), NKikimrLdap::EScope::SUBTREE, filter, RequestedAttributes, 0, &searchMessage);
412407
if (!NKikimrLdap::IsSuccess(result)) {
413408
NKikimrLdap::MsgFree(searchMessage);
414-
searchMessage = nullptr;
415409
return;
416410
}
417411
if (NKikimrLdap::CountEntries(ld, searchMessage) == 0) {
418412
NKikimrLdap::MsgFree(searchMessage);
419-
searchMessage = nullptr;
420413
return;
421414
}
422415
for (LDAPMessage* groupEntry = NKikimrLdap::FirstEntry(ld, searchMessage); groupEntry != nullptr; groupEntry = NKikimrLdap::NextEntry(ld, groupEntry)) {
@@ -439,7 +432,6 @@ class TLdapAuthProvider : public NActors::TActorBootstrapped<TLdapAuthProvider>
439432
}
440433
}
441434
NKikimrLdap::MsgFree(searchMessage);
442-
searchMessage = nullptr;
443435
}
444436
}
445437

0 commit comments

Comments
 (0)