kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel: Fix reference counting in ast_channel_suppress.

Browse Source 
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
This commit is contained in:
Joshua Colp
2017-06-15 12:32:32 +00:00
parent 54a08a2e43
commit bd16c3c524
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/channel.c
View File

@@ -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) 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; const struct ast_datastore_info *datastore_info = NULL;
struct ast_datastore *datastore = NULL; struct ast_datastore *datastore = NULL;
struct ast_framehook_interface interface = { 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) { if (framehook_id < 0) {
/* Hook attach failed. Get rid of the evidence. */ /* Hook attach failed. Get rid of the evidence. */
ast_log(LOG_WARNING, "Failed to attach framehook while attempting to suppress a stream.\n"); ast_log(LOG_WARNING, "Failed to attach framehook while attempting to suppress a stream.\n");
ao2_ref(suppress, -1);
return -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))) { if (!(datastore = ast_datastore_alloc(datastore_info, NULL))) {
ast_log(LOG_WARNING, "Failed to allocate datastore while attempting to suppress a stream.\n"); ast_log(LOG_WARNING, "Failed to allocate datastore while attempting to suppress a stream.\n");
ast_framehook_detach(chan, framehook_id); ast_framehook_detach(chan, framehook_id);
ao2_ref(suppress, -1);
return -1; return -1;
} }
/* and another ref for the datastore */ /* the ref provided by the allocation is taken by the datastore */
ao2_ref(suppress, +1);
datastore->data = suppress; datastore->data = suppress;
ast_channel_datastore_add(chan, datastore); ast_channel_datastore_add(chan, datastore);