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.
This commit is contained in:
Joshua Colp
2016-04-26 04:56:36 -05:00
committed by Gerrit Code Review
8 changed files with 44 additions and 10 deletions

View File

@@ -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;
}