app_cdr and res_parking: Fix some resource leaks.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 27 Sep 2013 21:58:05 +0000 (21:58 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 27 Sep 2013 21:58:05 +0000 (21:58 +0000)
* 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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400021 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_cdr.c
res/res_parking.c

index ba7139c..34fd456 100644 (file)
@@ -149,7 +149,9 @@ static int nocdr_exec(struct ast_channel *chan, const char *data)
 
 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)
index 12893db..211bbf8 100644 (file)
@@ -1169,6 +1169,7 @@ static int unload_module(void)
        ao2_cleanup(parking_lot_container);
        parking_lot_container = NULL;
        aco_info_destroy(&cfg_info);
+       ao2_global_obj_release(globals);
 
        return 0;
 }