From ed36e7431725612374d61dfa254050866001df49 Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 17 Jun 2008 15:48:31 +0000 Subject: [PATCH] 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: http://svn.digium.com/svn/asterisk/branches/1.4@123271 614ede4d-c843-0410-af14-a771ab80d22e --- main/astobj2.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main/astobj2.c b/main/astobj2.c index 7cbf70cce..bcf34556e 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -599,9 +599,18 @@ static int cd_cb(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 -- 2.11.4.GIT