diff options
| author | Derrell Lipman <derrell@samba.org> | 2007-08-14 14:27:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:41 -0500 |
| commit | c638a84cb1215f9d67531c72959baf10deea2700 (patch) | |
| tree | bba2574d5764f579804875369ad847cde9d68f39 | |
| parent | a12e7ef30a45c155c0f211d02445ef0ad46acde0 (diff) | |
| download | samba-c638a84cb1215f9d67531c72959baf10deea2700.tar.gz samba-c638a84cb1215f9d67531c72959baf10deea2700.tar.bz2 samba-c638a84cb1215f9d67531c72959baf10deea2700.zip | |
r24410: - I got tricked by function naming. Contrary to what seemed obvious to me,
prs_mem_free() is not the function to be called to free memory allocated by
prs_alloc_mem(). I've added a comment so others may not get bitten too.
- Remove incorrect memory free calls added yesterday to replace SAFE_FREE.
The memory is actually now on a talloc context, so gets freed by the caller
when that context is freed. We don't need to free it iternally.
Derrell
(This used to be commit 2fde343150c17959fc970b18e1eb4efde800b4db)
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 4 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_prs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index af619e8f3a..bcbdd5a15a 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -5142,8 +5142,6 @@ cacl_set(TALLOC_CTX *ctx, switch (mode) { case SMBC_XATTR_MODE_REMOVE_ALL: old->dacl->num_aces = 0; - prs_mem_free(old->dacl->aces); - prs_mem_free(&old->dacl); old->dacl = NULL; dacl = old->dacl; break; @@ -5162,8 +5160,6 @@ cacl_set(TALLOC_CTX *ctx, } old->dacl->num_aces--; if (old->dacl->num_aces == 0) { - prs_mem_free(&old->dacl->aces); - prs_mem_free(&old->dacl); old->dacl = NULL; } found = True; diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c index 26bd3a5cec..c51e1dff4a 100644 --- a/source3/rpc_parse/parse_prs.c +++ b/source3/rpc_parse/parse_prs.c @@ -122,6 +122,10 @@ BOOL prs_init(prs_struct *ps, uint32 size, TALLOC_CTX *ctx, BOOL io) /******************************************************************* Delete the memory in a parse structure - if we own it. + + NOTE: Contrary to the somewhat confusing naming, this function is not + intended for freeing memory allocated by prs_alloc_mem(). That memory + is attached to the talloc context given by ps->mem_ctx. ********************************************************************/ void prs_mem_free(prs_struct *ps) |