[asterisk-commits] kmoore: trunk r324708 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Jun 23 13:52:59 2011
New Revision: 324708

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324708
Log:
Merged revisions 324678 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r324678 | kmoore | 2011-06-23 13:29:17 -0500 (Thu, 23 Jun 2011) | 11 lines
  
  Merged revisions 324643 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r324643 | kmoore | 2011-06-23 13:21:12 -0500 (Thu, 23 Jun 2011) | 4 lines
    
    Addresses AST-2011-008, memory corruption and remote crash in SIP driver.
    
    AST-2011-008
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=324708&r1=324707&r2=324708
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jun 23 13:52:59 2011
@@ -25126,7 +25126,8 @@
 		return -1;
 	}
 
-	req.len = res;
+	/* req.data will have the correct length in case of nulls */
+	req.len = ast_str_strlen(req.data);
 	req.socket.fd = sipsock;
 	set_socket_transport(&req.socket, SIP_TRANSPORT_UDP);
 	req.socket.tcptls_session	= NULL;