diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2007-01-30 13:39:58 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2007-01-30 13:39:58 +0000 |
| commit | 4f6e3c99304bbb2e32cdf8cf802e7662dd3c7951 (patch) | |
| tree | 0c72496cafd43af32c8d1ef8bb7b2029789ad025 | |
| parent | 3f00cb0e9be91bf60a936d2d6e7e889c08b2e68e (diff) | |
Size passed to IP address fields is now fixed (reported AVP size includes 2 bytes of padding), causing assertion reported in bug 1332.
svn path=/trunk/; revision=20623
| -rw-r--r-- | epan/dissectors/packet-diameter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index b43f781450..3ea793c14b 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -1917,10 +1917,10 @@ static void dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree tvb, offset, 2, FALSE); if (tvb_get_ntohs(tvb, offset) == 0x0001) { proto_tree_add_item(avpi_tree, hf_diameter_avp_data_v4addr, - tvb, offset+2, avpDataLength-2, FALSE); + tvb, offset+2, 4, FALSE); } else if (tvb_get_ntohs(tvb, offset) == 0x0002) { proto_tree_add_item(avpi_tree, hf_diameter_avp_data_v6addr, - tvb, offset+2, avpDataLength-2, FALSE); + tvb, offset+2, 16, FALSE); } else { proto_tree_add_bytes_format(avpi_tree, hf_diameter_avp_data_bytes, tvb, offset, avpDataLength, |