sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "main/sdp_state: Check for errors from ast_stream_topology_set_stream."

This commit is contained in:
Joshua Colp 2017-11-09 03:43:35 -06:00 committed by Gerrit Code Review
parent 47d4848358 9b3db9a7fd
commit c32710386e
1 changed files with 12 additions and 3 deletions
Show Stats 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;
}
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;
}