sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Merge memory leak fixes in our trusted domain list from 3.0 to HEAD

Browse Source 
(This used to be commit c7f06f3a480feb1c7b1a44d16c05e1c238800b15)
This commit is contained in:
Andrew Bartlett 2003-04-28 09:14:31 +00:00
parent e627d756db
commit f0c62a47f7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/passdb/secrets.c
View File

@ -303,6 +303,8 @@ BOOL secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
/* unpack trusted domain password */ /* unpack trusted domain password */
pass_len = tdb_trusted_dom_pass_unpack(pass_buf, size, &pass); pass_len = tdb_trusted_dom_pass_unpack(pass_buf, size, &pass);
SAFE_FREE(pass_buf);
if (pass_len != size) { if (pass_len != size) {
DEBUG(5, ("Invalid secrets size. Unpacked data doesn't match trusted_dom_pass structure.\n")); DEBUG(5, ("Invalid secrets size. Unpacked data doesn't match trusted_dom_pass structure.\n"));
return False; return False;
@ -574,6 +576,11 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
if (!secrets_init()) return NT_STATUS_ACCESS_DENIED; if (!secrets_init()) return NT_STATUS_ACCESS_DENIED;
if (!pass) {
DEBUG(0, ("talloc_zero failed!\n"));
return NT_STATUS_NO_MEMORY;
}
*num_domains = 0; *num_domains = 0;
start_idx = *enum_ctx; start_idx = *enum_ctx;
@ -610,17 +617,14 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
packed_pass = secrets_fetch(secrets_key, &size); packed_pass = secrets_fetch(secrets_key, &size);
packed_size = tdb_trusted_dom_pass_unpack(packed_pass, size, pass); packed_size = tdb_trusted_dom_pass_unpack(packed_pass, size, pass);
/* packed representation isn't needed anymore */
SAFE_FREE(packed_pass);
if (size != packed_size) { if (size != packed_size) {
DEBUG(2, ("Secrets record %s is invalid!\n", secrets_key)); DEBUG(2, ("Secrets record %s is invalid!\n", secrets_key));
if (size) SAFE_FREE(packed_pass);
continue; continue;
} }
/* packed representation isn't needed anymore */
SAFE_FREE(packed_pass);
pull_ucs2_fstring(dom_name, pass->uni_name); pull_ucs2_fstring(dom_name, pass->uni_name);
DEBUG(18, ("Fetched secret record num %d.\nDomain name: %s, SID: %s\n", DEBUG(18, ("Fetched secret record num %d.\nDomain name: %s, SID: %s\n",
idx, dom_name, sid_string_static(&pass->domain_sid))); idx, dom_name, sid_string_static(&pass->domain_sid)));