[svn-commits] kmoore: trunk r418716 - in /trunk: ./ main/bridge_channel.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Jul 15 18:03:40 2014
New Revision: 418716

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418716
Log:
TEST_FRAMEWORK: Fix ref leak in feature activation

This fixes two reference leaks that would occur when TEST_FRAMEWORK was
enabled and features were successfully executed.
........

Merged revisions 418715 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/bridge_channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge_channel.c?view=diff&rev=418716&r1=418715&r2=418716
==============================================================================
--- trunk/main/bridge_channel.c (original)
+++ trunk/main/bridge_channel.c Tue Jul 15 18:03:40 2014
@@ -1477,10 +1477,15 @@
 			feature = "automixmon";
 		} else if (!strcmp(dtmf, featuremap->parkcall)) {
 			feature = "parkcall";
-		} else if (!strcmp(dtmf, xfer->atxferthreeway)) {
+		}
+	} else if (xfer) {
+		if (!strcmp(dtmf, xfer->atxferthreeway)) {
 			feature = "atxferthreeway";
 		}
 	}
+
+	ao2_cleanup(featuremap);
+	ao2_cleanup(xfer);
 
 	ast_test_suite_event_notify("FEATURE_DETECTION",
 			"Result: success\r\n"