[svn-commits] dbrooks: branch 1.6.2 r201446 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dbrooks
Date: Wed Jun 17 14:49:04 2009
New Revision: 201446

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201446
Log:
Merged revisions 201381 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201381 | dbrooks | 2009-06-17 14:15:07 -0500 (Wed, 17 Jun 2009) | 16 lines
  
  Merged revisions 201380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201380 | dbrooks | 2009-06-17 13:45:50 -0500 (Wed, 17 Jun 2009) | 9 lines
    
    Checks for NULL sip_pvt pointer in chan_sip.c->acf_channel_read()
    
    Zombie channels could be passed, and chan_sip.c wasn't checking for it.
    Could crash Asterisk. Now checking for NULL pointer.
    
    (closes issue #15330)
    Reported by: okrief
    Tested by: dbrooks
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

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

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=201446&r1=201445&r2=201446
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Wed Jun 17 14:49:04 2009
@@ -20113,6 +20113,10 @@
 
 	memset(buf, 0, buflen);
 
+	if (p == NULL) {
+		return -1;
+	}
+
 	if (!strcasecmp(args.param, "peerip")) {
 		ast_copy_string(buf, p->sa.sin_addr.s_addr ? ast_inet_ntoa(p->sa.sin_addr) : "", buflen);
 	} else if (!strcasecmp(args.param, "recvip")) {