diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-04-26 04:56:36 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-26 04:56:36 -0500 |
| commit | 4efc6b43155452b2f9cb5f96c7aea4cdfc1a84d1 (patch) | |
| tree | fad4c64e7f960c6bbe533f050af750b38ff5b61e /apps | |
| parent | 83dadc4683abcd10f0c4566abef541d997dcf5b8 (diff) | |
| parent | 1e93f3d7232a2a087a190a18e4a3f490a41d42d1 (diff) | |
Merge changes from topic 'system_stress_patches' into 13
* changes:
Bridge system: Fix memory leaks and double frees on impart failure.
bridge_softmix.c: Fix crash if channel fails to join mixing tech.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/confbridge/conf_chan_announce.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c index 6596a8537..ee4660687 100644 --- a/apps/confbridge/conf_chan_announce.c +++ b/apps/confbridge/conf_chan_announce.c @@ -199,7 +199,6 @@ int conf_announce_channel_push(struct ast_channel *ast) /* Impart the output channel into the bridge */ if (ast_bridge_impart(p->bridge, chan, NULL, features, AST_BRIDGE_IMPART_CHAN_DEPARTABLE)) { - ast_bridge_features_destroy(features); ast_channel_unref(chan); return -1; } |