Wireshark · Wireshark-commits: [Wireshark-commits] rev 49623: /trunk/epan/dissectors/ /trunk/epan/dissectors/: packet-http.c

[morriss@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=49623

User: morriss
Date: 2013/05/29 03:43 PM

Log:
 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.

Directory: /trunk/epan/dissectors/
  Changes    Path             Action
  +21 -7     packet-http.c    Modified