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

rtp_engine: improved handling of get_rtp_info failure

Browse Source 
In ast_rtp_instance_make_compatible(), after a failure of
channel tech call get_rtp_info() to return peer_instance,
the null pointer would be passed to ao2_ref, producing an
error that looked like a refernce counting problem but is
not.  This patch corrects that and adds helpful LOG_ERROR
messages to indicate which failure path occurred.

(issue AST-1276)
Review: https://reviewboard.asterisk.org/r/3156/
........

Merged revisions 406721 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 406722 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 406723 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Scott Griepentrog
2014-01-28 16:43:25 +00:00
parent aff9e1f583
commit 601692a7e4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/rtp_engine.c
View File

@@ -1357,11 +1357,15 @@ int ast_rtp_instance_make_compatible(struct ast_channel *chan, struct ast_rtp_in
} }
glue->get_rtp_info(peer, &peer_instance); glue->get_rtp_info(peer, &peer_instance);
if (!peer_instance) {
if (!peer_instance || peer_instance->engine != instance->engine) { ast_log(LOG_ERROR, "Unable to get_rtp_info for peer type %s\n", glue->type);
ast_channel_unlock(peer);
return -1;
}
if (peer_instance->engine != instance->engine) {
ast_log(LOG_ERROR, "Peer engine mismatch for type %s\n", glue->type);
ast_channel_unlock(peer); ast_channel_unlock(peer);
ao2_ref(peer_instance, -1); ao2_ref(peer_instance, -1);
peer_instance = NULL;
return -1; return -1;
} }