From: Mark Michelson Date: Tue, 29 Sep 2009 21:28:04 +0000 (+0000) Subject: Fix channel reference leak. X-Git-Tag: 11.0.0-beta1~4111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01181a27a051bded1f90f338f7d104f0a6fd6a29;p=thirdparty%2Fasterisk.git Fix channel reference leak. 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 --- diff --git a/main/cel.c b/main/cel.c index bc16656a5e..9fe9993a04 100644 --- a/main/cel.c +++ b/main/cel.c @@ -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);