diff options
| author | Corey Farrell <git@cfware.com> | 2017-12-18 19:40:08 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-12-18 19:40:08 -0500 |
| commit | 91d9eae79b0e0e17b259689c93749c4770b54ea7 (patch) | |
| tree | a070cbc1a84de10659ee91c67f9b3867834966e2 /bridges | |
| parent | 7b127e2d20a59850c0ef080afd38c2ade6a34422 (diff) | |
bridge_softmix: Fix memory leaks.
Change-Id: Ifaf3e93b398595d21d07f535330fef77ff15a80c
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 8de88f257..6460a6ea2 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -672,6 +672,7 @@ static int softmix_bridge_join(struct ast_bridge *bridge, struct ast_bridge_chan ast_log(LOG_ERROR, "Bridge %s: Failed to join channel %s. " "Could not allocate enough memory.\n", bridge->uniqueid, ast_channel_name(bridge_channel->chan)); + ast_free(sc); return -1; } } @@ -1306,6 +1307,8 @@ static int softmix_mixing_array_grow(struct softmix_mixing_array *mixing_array, ast_log(LOG_NOTICE, "Failed to re-allocate softmix mixing structure.\n"); return -1; } + mixing_array->buffers = tmp; + if (binaural_active) { struct convolve_channel_pair **tmp2; if (!(tmp2 = ast_realloc(mixing_array->chan_pairs, @@ -1315,7 +1318,6 @@ static int softmix_mixing_array_grow(struct softmix_mixing_array *mixing_array, } mixing_array->chan_pairs = tmp2; } - mixing_array->buffers = tmp; return 0; } |