kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

main/sdp_state: Check for errors from ast_stream_topology_set_stream.

Browse Source 
Change-Id: I84a83ae69daba5d185cc1d939b133a4c23565497
This commit is contained in:
Corey Farrell
2017-11-07 13:03:34 -05:00
parent 06746b0af5
commit 9b3db9a7fd
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/sdp_state.c
View File

@@ -1255,7 +1255,10 @@ static int sdp_merge_streams_match(
return -1; return -1;
} }
idx = AST_VECTOR_GET(current_vect, current_idx); 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 * The current_stream cannot be considered a backfill_candidate
@@ -1400,7 +1403,10 @@ static struct ast_stream_topology *merge_local_topologies(
if (!merged_stream) { if (!merged_stream) {
goto fail; 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 */ /* 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. */ /* 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; backfill_candidate[current_idx] = 0;
} }