diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-06-07 20:39:09 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-06-07 19:00:16 +0000 |
| commit | ae027ecd7cf2c7f35c9d7d710004b2199954c79e (patch) | |
| tree | 89cfe1cc1f5731b50c7f9747f7fee4cc15582cbd /epan/dissectors/packet-ndps.c | |
| parent | 093aebf5eeab624471a659cf8643a6a07e2b58e6 (diff) | |
NDPS: fix V535 warnings reported by PVS-Studio
The variable 'ii' is being used for this loop and for the outer loop.
Change-Id: I3e6e0e390a646fac62fd46ebf9dcdc56070f7609
Reviewed-on: https://code.wireshark.org/review/8820
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ndps.c')
| -rw-r--r-- | epan/dissectors/packet-ndps.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index c295bd5d46..d043063f83 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -6482,13 +6482,13 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g foffset = objectidentifier(tvb, btree, foffset); proto_item_set_end(bitem, tvb, foffset); /* Start of AttributeSet */ - number_of_items = tvb_get_ntohl(tvb, foffset); - proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items); + number_of_items2 = tvb_get_ntohl(tvb, foffset); + proto_tree_add_uint(atree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items2); foffset += 4; btree = proto_tree_add_subtree(atree, tvb, foffset, -1, ett_ndps, &bitem, "Attribute"); - for (ii = 0; ii < number_of_items; ii++ ) + for (jj = 0; jj < number_of_items2; jj++ ) { - if (ii >= NDPS_MAX_ITEMS) { + if (jj >= NDPS_MAX_ITEMS) { expert_add_info(pinfo, bitem, &ei_ndps_truncated); break; } @@ -7257,13 +7257,13 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset += align_4(tvb, foffset); proto_item_set_end(bitem, tvb, foffset); /* End of NameorID */ - number_of_items = tvb_get_ntohl(tvb, foffset); - proto_tree_add_uint(atree, hf_ndps_delivery_add_count, tvb, foffset, 4, number_of_items); + number_of_items2 = tvb_get_ntohl(tvb, foffset); + proto_tree_add_uint(atree, hf_ndps_delivery_add_count, tvb, foffset, 4, number_of_items2); foffset += 4; btree = proto_tree_add_subtree(atree, tvb, foffset, -1, ett_ndps, &bitem, "Delivery Addresses"); - for (ii = 0; ii < number_of_items; ii++ ) + for (jj = 0; jj < number_of_items2; jj++ ) { - if (ii >= NDPS_MAX_ITEMS) { + if (jj >= NDPS_MAX_ITEMS) { expert_add_info(pinfo, bitem, &ei_ndps_truncated); break; } @@ -7278,12 +7278,12 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int proto_item_set_end(bitem, tvb, foffset); /* Start of object identifier set */ btree = proto_tree_add_subtree(atree, tvb, foffset, -1, ett_ndps, &bitem, "Notify Attributes"); - number_of_items = tvb_get_ntohl(tvb, foffset); - expert_item = proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items); + number_of_items2 = tvb_get_ntohl(tvb, foffset); + expert_item = proto_tree_add_uint(btree, hf_ndps_num_attributes, tvb, foffset, 4, number_of_items2); foffset += 4; - for (ii = 0; ii < number_of_items; ii++ ) + for (jj = 0; jj < number_of_items2; jj++ ) { - if (ii >= NDPS_MAX_ITEMS) { + if (jj >= NDPS_MAX_ITEMS) { expert_add_info(pinfo, expert_item, &ei_ndps_truncated); break; } |