Fix channel reference leak.
authorMark Michelson <mmichelson@digium.com>
Tue, 29 Sep 2009 21:28:04 +0000 (21:28 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 29 Sep 2009 21:28:04 +0000 (21:28 +0000)
ast_cel_report_event would geet a reference to the
bridged channel. However, certain return paths, such
as if CEL was not enabled, would result in a reference
leak. All return paths now properly unref the channel.

(closes issue #15991)
Reported by: mmichelson

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

main/cel.c

index bc16656..9fe9993 100644 (file)
@@ -483,6 +483,9 @@ int ast_cel_report_event(struct ast_channel *chan, enum ast_cel_event_type event
 
        if (!cel_enabled || !ast_cel_track_event(event_type)) {
                ast_mutex_unlock(&reload_lock);
+               if (peer) {
+                       ast_channel_unref(peer);
+               }
                return 0;
        }
 
@@ -490,6 +493,9 @@ int ast_cel_report_event(struct ast_channel *chan, enum ast_cel_event_type event
                char *app;
                if (!(app = ao2_find(appset, (char *) chan->appl, OBJ_POINTER))) {
                        ast_mutex_unlock(&reload_lock);
+                       if (peer) {
+                               ast_channel_unref(peer);
+                       }
                        return 0;
                }
                ao2_ref(app, -1);