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

r24410: - I got tricked by function naming. Contrary to what seemed obvious to me,

Browse Source 
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)
This commit is contained in:
Derrell Lipman 2007-08-14 14:27:42 +00:00 committed by Gerald (Jerry) Carter
parent a12e7ef30a
commit c638a84cb1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/libsmb/libsmbclient.c
View File

@ -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;

4
source3/rpc_parse/parse_prs.c
View File

@ -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)