osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix for bug 3710: 

Use the derived length of the control field i.s.o. assuming its size.

svn path=/trunk/; revision=29087
This commit is contained in:
Jaap Keuter 2009-07-13 22:29:59 +00:00
parent e3be7b8b25
commit 668e9b693a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-llc.c
View File

@ -307,7 +307,7 @@ capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) {
return;
}
if (is_snap)
capture_snap(pd, offset+3, len, ld);
capture_snap(pd, offset+llc_header_len, len, ld);
else {
/* non-SNAP */
switch (pd[offset]) {
@ -518,7 +518,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item_set_len(ti, llc_header_len);
if (is_snap) {
dissect_snap(tvb, 3, pinfo, tree, llc_tree, control,
dissect_snap(tvb, 2+XDLC_CONTROL_LEN(control, TRUE), pinfo, tree, llc_tree, control,
hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
}
else {