From: Corey Farrell <git@cfware.com>
Date: Tue, 7 Nov 2017 18:03:34 +0000 (-0500)
Subject: main/sdp_state: Check for errors from ast_stream_topology_set_stream.
X-Git-Tag: 16.0.0-rc1~653^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b3db9a7fd86544ecec79b226aa4c6687a52c7cf;p=thirdparty%2Fasterisk.git

main/sdp_state: Check for errors from ast_stream_topology_set_stream.

Change-Id: I84a83ae69daba5d185cc1d939b133a4c23565497
---

diff --git a/main/sdp_state.c b/main/sdp_state.c
index a77d96da5d..2b75cc2a15 100644
--- a/main/sdp_state.c
+++ b/main/sdp_state.c
@@ -1255,7 +1255,10 @@ static int sdp_merge_streams_match(
 					return -1;
 				}
 				idx = AST_VECTOR_GET(current_vect, current_idx);
-				ast_stream_topology_set_stream(merged_topology, idx, merged_stream);
+				if (ast_stream_topology_set_stream(merged_topology, idx, merged_stream)) {
+					ast_stream_free(merged_stream);
+					return -1;
+				}
 
 				/*
 				 * The current_stream cannot be considered a backfill_candidate
@@ -1400,7 +1403,10 @@ static struct ast_stream_topology *merge_local_topologies(
 		if (!merged_stream) {
 			goto fail;
 		}
-		ast_stream_topology_set_stream(merged_topology, idx, merged_stream);
+		if (ast_stream_topology_set_stream(merged_topology, idx, merged_stream)) {
+			ast_stream_free(merged_stream);
+			goto fail;
+		}
 	}
 
 	/* Backfill new update stream slots into pre-existing declined current stream slots */
@@ -1438,7 +1444,10 @@ static struct ast_stream_topology *merge_local_topologies(
 		}
 
 		/* Add the new stream into the backfill stream slot. */
-		ast_stream_topology_set_stream(merged_topology, current_idx, merged_stream);
+		if (ast_stream_topology_set_stream(merged_topology, current_idx, merged_stream)) {
+			ast_stream_free(merged_stream);
+			goto fail;
+		}
 		backfill_candidate[current_idx] = 0;
 	}