From 8e1dd2e74038e4e7138bd908e37aeb5aadd27450 Mon Sep 17 00:00:00 2001 From: Scott Griepentrog Date: Tue, 28 Jan 2014 16:41:43 +0000 Subject: [PATCH] rtp_engine: improved handling of get_rtp_info failure 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@406723 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp_engine.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 82fb3b2be5..4e686fa1bd 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -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); - - if (!peer_instance || peer_instance->engine != instance->engine) { + if (!peer_instance) { + 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); ao2_ref(peer_instance, -1); - peer_instance = NULL; return -1; } -- 2.47.2