diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-09-27 21:58:05 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-09-27 21:58:05 +0000 |
commit | 2b32732aa814647d5a098043225c9a66eefb76d9 (patch) | |
tree | 98510028754a0e96eeca7e9ce5edfb7355eef933 | |
parent | 9f19d096e329d435d982723295c0c727ab13dfb7 (diff) |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | apps/app_cdr.c | 4 | ||||
-rw-r--r-- | res/res_parking.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_cdr.c b/apps/app_cdr.c index ba7139cf1..34fd45675 100644 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -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) diff --git a/res/res_parking.c b/res/res_parking.c index 12893dba2..211bbf8a8 100644 --- a/res/res_parking.c +++ b/res/res_parking.c @@ -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; } |