[svn-commits] russell: branch 1.6.0 r123273 - in /branches/1.6.0: ./ main/astobj2.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 17 10:52:36 2008
New Revision: 123273

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123273
Log:
Merged revisions 123272 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r123272 | russell | 2008-06-17 10:52:13 -0500 (Tue, 17 Jun 2008) | 12 lines

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.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/astobj2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/astobj2.c?view=diff&rev=123273&r1=123272&r2=123273
==============================================================================
--- branches/1.6.0/main/astobj2.c (original)
+++ branches/1.6.0/main/astobj2.c Tue Jun 17 10:52:36 2008
@@ -588,8 +588,17 @@
 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);