diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-01 01:49:02 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-01 01:49:02 +0000 |
| commit | ed7475f1570943305c11b54bac564f3ee737ac7f (patch) | |
| tree | 54960f1377cdf80bc8ef5da57959b7e39b87803b /epan/dissectors/packet-sll.c | |
| parent | 0cebbd1f0cf86bd80f205d8bb89aaae2b93b5902 (diff) | |
From Chris Maynard:
don't add a source address field if it's zero-length (fixes bug
2519);
the source address length field is 8 octets long; if the
purported length is > 8, only include the first 8 octets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34303 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-sll.c')
| -rw-r--r-- | epan/dissectors/packet-sll.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index d6c1c9c79c..4907bea69b 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -207,10 +207,12 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 6, 6, src); } break; + case 0: + break; default: if (tree) { proto_tree_add_item(fh_tree, hf_sll_src_other, tvb, - 6, halen, FALSE); + 6, halen > 8 ? 8 : halen, FALSE); } break; } |