[asterisk-commits] rmudgett: trunk r400021 - in /trunk: ./ apps/app_cdr.c res/res_parking.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 27 16:58:05 2013
New Revision: 400021

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400021
Log:
app_cdr and res_parking: Fix some resource leaks.

* app_cdr left the ResetCDR application registered.

* res_parking leaked a ref to config global.

(closes issue ASTERISK-22566)
Reported by: Corey Farrell
Patches:
      ASTERISK-22566-r2.patch (license #5909) patch uploaded by Corey Farrell
........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_cdr.c
    trunk/res/res_parking.c

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

Modified: trunk/apps/app_cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_cdr.c?view=diff&rev=400021&r1=400020&r2=400021
==============================================================================
--- trunk/apps/app_cdr.c (original)
+++ trunk/apps/app_cdr.c Fri Sep 27 16:58:05 2013
@@ -149,7 +149,9 @@
 
 static int unload_module(void)
 {
-	return ast_unregister_application(nocdr_app);
+	ast_unregister_application(nocdr_app);
+	ast_unregister_application(resetcdr_app);
+	return 0;
 }
 
 static int load_module(void)

Modified: trunk/res/res_parking.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_parking.c?view=diff&rev=400021&r1=400020&r2=400021
==============================================================================
--- trunk/res/res_parking.c (original)
+++ trunk/res/res_parking.c Fri Sep 27 16:58:05 2013
@@ -1169,6 +1169,7 @@
 	ao2_cleanup(parking_lot_container);
 	parking_lot_container = NULL;
 	aco_info_destroy(&cfg_info);
+	ao2_global_obj_release(globals);
 
 	return 0;
 }