From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 23 Jun 2011 18:21:12 +0000 (+0000)
Subject: Addresses AST-2011-008, memory corruption and remote crash in SIP driver.
X-Git-Tag: 1.6.2.19-rc1~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69bd6fdad79d334b4036eaa0c942811636566f04;p=thirdparty%2Fasterisk.git

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.6.2@324643 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7908a14b0a..2981eb6dce 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -22706,7 +22706,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;