diff options
| author | kmoore <kmoore@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-23 18:52:59 +0000 |
|---|---|---|
| committer | kmoore <kmoore@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-23 18:52:59 +0000 |
| commit | f489aff1e2e30f4f15ae4a52ae9ad750e2310b59 (patch) | |
| tree | 04aa7b20c525a5ab946d89700a0dbbb0b9d1a230 | |
| parent | 991ab4dd5a3377eb79d031255cdd20e6cc459c3a (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@324708 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e4dadc3d8..052959763 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -25126,7 +25126,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; |