diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-11-30 15:55:28 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-11-30 15:55:28 +0000 |
| commit | 9c4cee6966c20b6b7f7e02b237c31cad835ff9d7 (patch) | |
| tree | fae56888a5417689302bcd112ece7c0ba94ec82f /epan | |
| parent | 7036dc2cf2053224be4ff884701b22a53c270800 (diff) | |
From Florent DROUIN:
There is a new check for the length, and the reported_length is added to the
offset, instead of the "theorical" length of the element.
This fixes bug 2052.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23687 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-rpl.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 59d84ed822..60d0de16e3 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -148,11 +148,16 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reported_length = tvb_reported_length_remaining(tvb, offset); if (reported_length > sublen) reported_length = sublen; - dissect_rpl_container(tvb_new_subset(tvb, + if ( length > 0) { + dissect_rpl_container(tvb_new_subset(tvb, offset, length, reported_length), pinfo, rpl_container_tree); - - offset += sublen; + offset += reported_length; + } else { + /* no more data, exit the loop */ + offset += reported_length; + break; + } } break; |