From 1e7ff894673524cab0b1cf42c6033c76b69d9964 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 23 Jun 2011 18:29:17 +0000 Subject: [PATCH] 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 --- channels/chan_sip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ec79ce4e3a..a1cf8dcb54 100644 --- 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; -- 2.47.2