diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:59 +0000 |
| commit | 982fc7184d46621948e53b485c7504c9d11f3350 (patch) | |
| tree | ca218a5ad0f5395fd3f39a22754b767c04265711 /epan/dissectors/packet-fcfzs.c | |
| parent | Releasing progress-linux version 4.2.4-1~progress7.99u1. (diff) | |
| download | wireshark-982fc7184d46621948e53b485c7504c9d11f3350.tar.xz wireshark-982fc7184d46621948e53b485c7504c9d11f3350.zip | |
Merging upstream version 4.2.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-fcfzs.c')
| -rw-r--r-- | epan/dissectors/packet-fcfzs.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 4cbf519..82a55f7 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -116,9 +116,13 @@ dissect_fcfzs_zoneset(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int o len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_fcfzs_zonesetnmlen, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset+4, + offset += 4; + proto_tree_add_item(tree, hf_fcfzs_zonesetname, tvb, offset, len, ENC_ASCII); - offset += 4 + len + (4-(len % 4)); + offset += len; + /* Fill Bytes */ + if (len % 4) + offset += 4 - (len % 4); /* Number of zones */ @@ -131,9 +135,13 @@ dissect_fcfzs_zoneset(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int o len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_fcfzs_zonenmlen, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset+4, + offset += 4; + proto_tree_add_item(tree, hf_fcfzs_zonename, tvb, offset, len, ENC_ASCII); - offset += 4 + len + (4-(len % 4)); + offset += len; + /* Fill Bytes */ + if (len % 4) + offset += 4 - (len % 4); nummbrs = tvb_get_ntohl(tvb, offset); proto_tree_add_item(tree, hf_fcfzs_nummbrentries, tvb, offset, |