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

Merge "res_rtp_asterisk: Fix crash on ast_rtp_new failure." into 16

This commit is contained in:
George Joseph 2018-09-24 09:26:01 -05:00 committed by Gerrit Code Review
parent 361295f192 7a7b21f3a0
commit a389b020de
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_rtp_asterisk.c
View File

@ -3504,6 +3504,7 @@ static int rtp_allocate_transport(struct ast_rtp_instance *instance, struct ast_
if (x == startplace || (errno != EADDRINUSE && errno != EACCES)) {
ast_log(LOG_ERROR, "Oh dear... we couldn't allocate a port for RTP instance '%p'\n", instance);
close(rtp->s);
rtp->s = -1;
return -1;
}
}
@ -3650,7 +3651,10 @@ static int ast_rtp_new(struct ast_rtp_instance *instance,
ast_rtp_instance_set_data(instance, rtp);
if (rtp_allocate_transport(instance, rtp)) {
ast_free(rtp);
return -1;
}
if (AST_VECTOR_INIT(&rtp->ssrc_mapping, 1)) {
return -1;
}
@ -3658,7 +3662,6 @@ static int ast_rtp_new(struct ast_rtp_instance *instance,
rtp->lastrxformat = ao2_bump(ast_format_none);
rtp->lasttxformat = ao2_bump(ast_format_none);
rtp->stream_num = -1;
AST_VECTOR_INIT(&rtp->ssrc_mapping, 1);
return 0;
}