From: Corey Farrell <git@cfware.com>
Date: Tue, 19 Dec 2017 00:40:08 +0000 (-0500)
Subject: bridge_softmix: Fix memory leaks.
X-Git-Tag: 15.2.0-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cdaecc2ac6afe10d0014cd5d0a8913ab9116a15;p=thirdparty%2Fasterisk.git

bridge_softmix: Fix memory leaks.

Change-Id: Ifaf3e93b398595d21d07f535330fef77ff15a80c
---

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 8de88f257c..6460a6ea2a 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;
 }