wireshark/wireshark-0014-Fix-https-bugs.wireshark.org-bugzilla-show_bug.cgi-i.patch
Peter Lemenkov 65d033ba77 Few bugfixes and enhancements
- Updated RTPproxy dissector (again)
- Allow packets more than 64k (for USB capture). See patch no. 13
- Don't die during loading of some SIP capture files. See patch no. 14
- Backport support for RTPproxy dissector timeouts detection. See patch no. 15

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2013-11-27 16:24:19 +04:00

23 lines
737 B
Diff

From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Sat, 9 Nov 2013 15:44:01 +0000
Subject: [PATCH] Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9388
: Avoid an infinite loop in SIP dissector (backport of r51738)
svn path=/trunk-1.10/; revision=53195
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index a3ceec2..b012837 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -2134,6 +2134,10 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
*/
orig_offset = offset;
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+ if(linelen==0){
+ return -2;
+ }
+
if (tvb_strnlen(tvb, offset, linelen) > -1)
{
/*