diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-06-15 12:32:32 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2017-06-15 07:36:59 -0500 |
| commit | bd16c3c524f7afa79a530fe5000f7054c22dd5f4 (patch) | |
| tree | f80ae56ef77cf88d7230499b773eab108ed9527e /main/channel.c | |
| parent | 54a08a2e43fffb82b2db51c73347964842f9ae63 (diff) | |
channel: Fix reference counting in ast_channel_suppress.
The ast_channel_suppress function wrongly decremented the
reference count of the underlying structure used to keep
track of what should be suppressed on a channel if the
function was called multiple times on the same channel.
This change cleans up the reference counting a bit so
this no longer occurs.
ASTERISK-27016
Change-Id: I2eed4077cb4916e6626f9f120b63b963acc5c136
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index 58f960aaf..1ca485e7a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -10744,7 +10744,7 @@ static const struct ast_datastore_info *suppress_get_datastore_information(enum int ast_channel_suppress(struct ast_channel *chan, unsigned int direction, enum ast_frame_type frametype) { - RAII_VAR(struct suppress_data *, suppress, NULL, ao2_cleanup); + struct suppress_data *suppress; const struct ast_datastore_info *datastore_info = NULL; struct ast_datastore *datastore = NULL; struct ast_framehook_interface interface = { @@ -10780,6 +10780,7 @@ int ast_channel_suppress(struct ast_channel *chan, unsigned int direction, enum if (framehook_id < 0) { /* Hook attach failed. Get rid of the evidence. */ ast_log(LOG_WARNING, "Failed to attach framehook while attempting to suppress a stream.\n"); + ao2_ref(suppress, -1); return -1; } @@ -10791,11 +10792,11 @@ int ast_channel_suppress(struct ast_channel *chan, unsigned int direction, enum if (!(datastore = ast_datastore_alloc(datastore_info, NULL))) { ast_log(LOG_WARNING, "Failed to allocate datastore while attempting to suppress a stream.\n"); ast_framehook_detach(chan, framehook_id); + ao2_ref(suppress, -1); return -1; } - /* and another ref for the datastore */ - ao2_ref(suppress, +1); + /* the ref provided by the allocation is taken by the datastore */ datastore->data = suppress; ast_channel_datastore_add(chan, datastore); |