diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-06-15 16:18:26 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-15 16:18:26 -0500 |
| commit | 37bc343b58914bee30455ffa70009e20ac9e909c (patch) | |
| tree | 363e4bf9a086c82a20b310cb39e6d2ac55256fe3 | |
| parent | ae6c38db98252851bff0bada46046b109ee27155 (diff) | |
| parent | 4910a3bf402baddf8ed72badfaed7ae64da48686 (diff) | |
Merge "channel: Fix reference counting in ast_channel_suppress." into 13
| -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 e1ee516a2..2addfb53b 100644 --- a/main/channel.c +++ b/main/channel.c @@ -10822,7 +10822,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 = { @@ -10858,6 +10858,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; } @@ -10869,11 +10870,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); |