[svn-commits] coreyfarrell: branch 12 r418466 - in /branches/12: ./ apps/ main/

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Sun Jul 13 11:44:56 2014
New Revision: 418466

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418466
Log:
Fix minor reference leaks in app_skel and TEST_FRAMEWORK

* Cleanup games object in app_skel.
* Cleanup stasis subscription to TEST_FRAMEWORK in manager.c (12+).

Review: https://reviewboard.asterisk.org/r/3757/
........

Merged revisions 418465 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/apps/app_skel.c
    branches/12/main/manager.c

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

Modified: branches/12/apps/app_skel.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/app_skel.c?view=diff&rev=418466&r1=418465&r2=418466
==============================================================================
--- branches/12/apps/app_skel.c (original)
+++ branches/12/apps/app_skel.c Sun Jul 13 11:44:56 2014
@@ -702,6 +702,7 @@
 	ast_cli_unregister_multiple(skel_cli, ARRAY_LEN(skel_cli));
 	aco_info_destroy(&cfg_info);
 	ao2_global_obj_release(globals);
+	ao2_cleanup(games);
 	return ast_unregister_application(app);
 }
 

Modified: branches/12/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/manager.c?view=diff&rev=418466&r1=418465&r2=418466
==============================================================================
--- branches/12/main/manager.c (original)
+++ branches/12/main/manager.c Sun Jul 13 11:44:56 2014
@@ -1138,6 +1138,10 @@
 
 /*! \brief The \ref stasis_subscription for forwarding the Security topic to the AMI topic */
 static struct stasis_forward *security_topic_forwarder;
+
+#ifdef TEST_FRAMEWORK
+struct stasis_subscription *test_suite_sub;
+#endif
 
 #define MGR_SHOW_TERMINAL_WIDTH 80
 
@@ -7958,6 +7962,10 @@
 	ao2_t_global_obj_release(event_docs, "Dispose of event_docs");
 #endif
 
+#ifdef TEST_FRAMEWORK
+	stasis_unsubscribe(test_suite_sub);
+#endif
+
 	if (stasis_router) {
 		stasis_message_router_unsubscribe_and_join(stasis_router);
 		stasis_router = NULL;
@@ -8149,7 +8157,7 @@
 		ast_manager_register_xml_core("BlindTransfer", EVENT_FLAG_CALL, action_blind_transfer);
 
 #ifdef TEST_FRAMEWORK
-		stasis_subscribe(ast_test_suite_topic(), test_suite_event_cb, NULL);
+		test_suite_sub = stasis_subscribe(ast_test_suite_topic(), test_suite_event_cb, NULL);
 #endif
 
 		ast_cli_register_multiple(cli_manager, ARRAY_LEN(cli_manager));