[asterisk-commits] coreyfarrell: trunk r418467 - in /trunk: ./ apps/app_skel.c main/manager.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Sun Jul 13 11:48:48 2014
New Revision: 418467

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418467
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
........

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

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

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

Modified: trunk/apps/app_skel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_skel.c?view=diff&rev=418467&r1=418466&r2=418467
==============================================================================
--- trunk/apps/app_skel.c (original)
+++ trunk/apps/app_skel.c Sun Jul 13 11:48:48 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: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=418467&r1=418466&r2=418467
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Sun Jul 13 11:48:48 2014
@@ -1149,6 +1149,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
 
@@ -7987,6 +7991,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;
@@ -8179,7 +8187,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));