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

Inside _talloc_free_internal(), always call talloc_memlimit_update_on_free() before we free the real memory.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
This commit is contained in:
Jeremy Allison
2013-08-27 12:54:38 -07:00
parent 4dfde7d33e
commit 6bc190d6dd
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/talloc/talloc.c
View File

@ -909,29 +909,6 @@ static inline int _talloc_free_internal(void *ptr, const char *location)
tc->flags |= TALLOC_FLAG_FREE;
/*
* If we are part of a memory limited context hierarchy
* we need to subtract the memory used from the counters
*/
if (tc->limit) {
struct talloc_memlimit *l;
for (l = tc->limit; l != NULL; l = l->upper) {
if (l->cur_size >= tc->size+TC_HDR_SIZE) {
l->cur_size -= tc->size+TC_HDR_SIZE;
} else {
talloc_abort("cur_size memlimit counter not correct!");
return 0;
}
}
if (tc->limit->parent == tc) {
free(tc->limit);
}
tc->limit = NULL;
}
/* we mark the freed memory with where we called the free
* from. This means on a double free error we can report where
* the first free came from
@ -952,6 +929,8 @@ static inline int _talloc_free_internal(void *ptr, const char *location)
return 0;
}
talloc_memlimit_update_on_free(tc);
TC_INVALIDATE_FULL_CHUNK(tc);
free(tc);
return 0;
@ -962,6 +941,8 @@ static inline int _talloc_free_internal(void *ptr, const char *location)
return 0;
}
talloc_memlimit_update_on_free(tc);
TC_INVALIDATE_FULL_CHUNK(tc);
free(tc);
return 0;