[asterisk-commits] may: branch may/ooh323_ipv6 r313144 - in /team/may/ooh323_ipv6: ./ addons/

[SVN commits to the Asterisk project]

Author: may
Date: Sat Apr  9 16:02:18 2011
New Revision: 313144

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

................
  r313143 | may | 2011-04-10 01:00:15 +0400 (Sun, 10 Apr 2011) | 10 lines
  
  Merged revisions 313142 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r313142 | may | 2011-04-10 00:56:17 +0400 (Sun, 10 Apr 2011) | 3 lines
    
    fix trivial bug in ooh323_indicate on AST_CONTROL_SRC...
    check p->rtp is not null
  ........
................

Modified:
    team/may/ooh323_ipv6/   (props changed)
    team/may/ooh323_ipv6/addons/chan_ooh323.c

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Apr  9 16:02:18 2011
@@ -1,1 +1,1 @@
-/trunk:1-313132
+/trunk:1-313143

Modified: team/may/ooh323_ipv6/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/chan_ooh323.c?view=diff&rev=313144&r1=313143&r2=313144
==============================================================================
--- team/may/ooh323_ipv6/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6/addons/chan_ooh323.c Sat Apr  9 16:02:18 2011
@@ -1245,10 +1245,14 @@
 		}
 	 break;
 	case AST_CONTROL_SRCUPDATE:
-		ast_rtp_instance_update_source(p->rtp);
+		if (p->rtp) {
+			ast_rtp_instance_update_source(p->rtp);
+		}
 		break;
 	case AST_CONTROL_SRCCHANGE:
-		ast_rtp_instance_change_source(p->rtp);
+		if (p->rtp) {
+			ast_rtp_instance_change_source(p->rtp);
+		}
 		break;
 	case AST_CONTROL_CONNECTED_LINE:
 		if (!ast->connected.id.name.valid