Merged revisions 123271 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123271 | russell | 2008-06-17 10:48:31 -0500 (Tue, 17 Jun 2008) | 4 lines

Fix a memory leak in astobj2 that was pointed out by seanbright.  When a container
got destroyed, the underlying bucket list entry for each object that was in the
container at that time did not get free'd.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-06-17 15:52:13 +00:00
parent c837af5e28
commit 8b1646163d

View File

@@ -808,9 +808,18 @@ static int cd_cb_debug(void *obj, void *arg, int flag)
static void container_destruct(void *_c)
{
struct ao2_container *c = _c;
int i;
_ao2_callback(c, OBJ_UNLINK, cd_cb, NULL);
for (i = 0; i < c->n_buckets; i++) {
struct bucket_list *cur;
while ((cur = AST_LIST_REMOVE_HEAD(&c->buckets[i], entry))) {
ast_free(cur);
}
}
#ifdef AO2_DEBUG
ast_atomic_fetchadd_int(&ao2.total_containers, -1);
#endif