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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324678 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ec79ce4e3a7d53b22f84f7653345e425cc8f7684..a1cf8dcb540276b698d334e538d9f1f8a4652b99 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -24496,7 +24496,8 @@ static int sipsock_read(int *id, int fd, short events, void *ignore)
                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;