[svn-commits] file: branch 1.6.0 r116849 - in /branches/1.6.0: ./ channels/chan_skinny.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri May 16 16:35:33 2008
New Revision: 116849

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116849
Log:
Merged revisions 116800 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r116800 | file | 2008-05-16 17:30:24 -0300 (Fri, 16 May 2008) | 12 lines

Merged revisions 116799 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r116799 | file | 2008-05-16 17:28:11 -0300 (Fri, 16 May 2008) | 4 lines

Check to make sure an RTP structure exists before calling ast_rtp_new_source on it.
(closes issue #12669)
Reported by: sbisker

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_skinny.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_skinny.c?view=diff&rev=116849&r1=116848&r2=116849
==============================================================================
--- branches/1.6.0/channels/chan_skinny.c (original)
+++ branches/1.6.0/channels/chan_skinny.c Fri May 16 16:35:33 2008
@@ -3758,7 +3758,9 @@
 	case AST_CONTROL_PROCEEDING:
 		break;
 	case AST_CONTROL_SRCUPDATE:
-		ast_rtp_new_source(sub->rtp);
+		if (sub->rtp) {
+			ast_rtp_new_source(sub->rtp);
+		}
 		break;
 	default:
 		ast_log(LOG_WARNING, "Don't know how to indicate condition %d\n", ind);