[asterisk-commits] coreyfarrell: branch 11 r424787 - in /branches/11: ./ main/astobj2.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Tue Oct  7 16:30:07 2014
New Revision: 424787

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424787
Log:
astobj2: Correct REF_DEBUG false leak report

When ao2_callback is run with OBJ_MULTIPLE and not OBJ_NODATA
it allocates a temporary container in a way that does not
record REF_DEBUG log entries.  This changes that container
to correctly record unref's when the container is freed. 

ASTERISK-24390 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4047/
........

Merged revisions 424786 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/astobj2.c?view=diff&rev=424787&r1=424786&r2=424787
==============================================================================
--- branches/11/main/astobj2.c (original)
+++ branches/11/main/astobj2.c Tue Oct  7 16:30:07 2014
@@ -1027,7 +1027,7 @@
 		 * is destroyed, the container will be automatically
 		 * destroyed as well.
 		 */
-		multi_container = __ao2_container_alloc(AO2_ALLOC_OPT_LOCK_NOLOCK, 1, NULL, NULL);
+		multi_container = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_NOLOCK, 1, NULL, NULL);
 		if (!multi_container) {
 			return NULL;
 		}