kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_native_rtp.c: Defer allocation and check if it fails in native_rtp_bridge_compatible().

Browse Source 
Review: https://reviewboard.asterisk.org/r/4601/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2015-04-09 15:54:05 +00:00
parent 2679d0100a
commit 92c1688edb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bridges/bridge_native_rtp.c
View File

@@ -310,8 +310,8 @@ static int native_rtp_bridge_compatible(struct ast_bridge *bridge)
RAII_VAR(struct ast_rtp_instance *, instance1, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, instance1, NULL, ao2_cleanup);
RAII_VAR(struct ast_rtp_instance *, vinstance0, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, vinstance0, NULL, ao2_cleanup);
RAII_VAR(struct ast_rtp_instance *, vinstance1, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, vinstance1, NULL, ao2_cleanup);
RAII_VAR(struct ast_format_cap *, cap0, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT), ao2_cleanup); RAII_VAR(struct ast_format_cap *, cap0, NULL, ao2_cleanup);
RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT), ao2_cleanup); RAII_VAR(struct ast_format_cap *, cap1, NULL, ao2_cleanup);
int read_ptime0, read_ptime1, write_ptime0, write_ptime1; int read_ptime0, read_ptime1, write_ptime0, write_ptime1;
/* We require two channels before even considering native bridging */ /* We require two channels before even considering native bridging */
@@ -361,6 +361,12 @@ static int native_rtp_bridge_compatible(struct ast_bridge *bridge)
return 0; return 0;
} }
cap0 = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
cap1 = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
if (!cap0 || !cap1) {
return 0;
}
/* Make sure that codecs match */ /* Make sure that codecs match */
if (glue0->get_codec) { if (glue0->get_codec) {
glue0->get_codec(bc0->chan, cap0); glue0->get_codec(bc0->chan, cap0);