From 9b3db9a7fd86544ecec79b226aa4c6687a52c7cf Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Tue, 7 Nov 2017 13:03:34 -0500 Subject: main/sdp_state: Check for errors from ast_stream_topology_set_stream. Change-Id: I84a83ae69daba5d185cc1d939b133a4c23565497 --- main/sdp_state.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'main/sdp_state.c') diff --git a/main/sdp_state.c b/main/sdp_state.c index a77d96da5..2b75cc2a1 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; } -- cgit v1.2.3