diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 09:14:31 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 09:14:31 +0000 |
| commit | f0c62a47f7beede12ff71a57f252ec35215d0015 (patch) | |
| tree | fa7c7eb3e5c68531208cec60b5eed678da755a8a /source3 | |
| parent | e627d756db8baa6d1a4deffc56e1873c4afd7248 (diff) | |
| download | samba-f0c62a47f7beede12ff71a57f252ec35215d0015.tar.gz samba-f0c62a47f7beede12ff71a57f252ec35215d0015.tar.bz2 samba-f0c62a47f7beede12ff71a57f252ec35215d0015.zip | |
Merge memory leak fixes in our trusted domain list from 3.0 to HEAD
(This used to be commit c7f06f3a480feb1c7b1a44d16c05e1c238800b15)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/secrets.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 138a9231fd..5df0edc29a 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -303,6 +303,8 @@ BOOL secrets_fetch_trusted_domain_password(const char *domain, char** pwd, /* unpack trusted domain password */ pass_len = tdb_trusted_dom_pass_unpack(pass_buf, size, &pass); + SAFE_FREE(pass_buf); + if (pass_len != size) { DEBUG(5, ("Invalid secrets size. Unpacked data doesn't match trusted_dom_pass structure.\n")); return False; @@ -573,7 +575,12 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in NTSTATUS status; if (!secrets_init()) return NT_STATUS_ACCESS_DENIED; - + + if (!pass) { + DEBUG(0, ("talloc_zero failed!\n")); + return NT_STATUS_NO_MEMORY; + } + *num_domains = 0; 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_size = tdb_trusted_dom_pass_unpack(packed_pass, size, pass); - + /* packed representation isn't needed anymore */ + SAFE_FREE(packed_pass); + if (size != packed_size) { DEBUG(2, ("Secrets record %s is invalid!\n", secrets_key)); - if (size) SAFE_FREE(packed_pass); - continue; } - /* packed representation isn't needed anymore */ - SAFE_FREE(packed_pass); - pull_ucs2_fstring(dom_name, pass->uni_name); DEBUG(18, ("Fetched secret record num %d.\nDomain name: %s, SID: %s\n", idx, dom_name, sid_string_static(&pass->domain_sid))); |