http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49821
User: gerald
Date: 2013/06/06 02:02 PM
Log:
Copy over r49623 from the trunk:
------------------------------------------------------------------------
r49623 | morriss | 2013-05-29 15:43:20 -0700 (Wed, 29 May 2013) | 10 lines
Changed paths:
M /trunk/epan/dissectors/packet-http.c
Fix the infinite recursion problem reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8733 :
We can't solely rely on the port in the URI to determine whether we will be
recursively called by decode_tcp_ports(). Instead also check the conversation
entry too: if we find that we are the subdissector for this conversation
(which we might be--without the port being in our list of ports--if we
heuristically picked up the conversation or the user did Decode-As),
just bail out and dissect the payload as data.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+21 -7 packet-http.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+43 -0 release-notes.xml Modified