diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-10-19 19:19:42 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-19 19:19:42 +0000 |
commit | a75d7209f56e576ef2146026dd791d81acb1fc0b (patch) | |
tree | 6f231a818a89eba1793260f8ab7048cc8561750a /epan | |
parent | 9d2a6d1b97cd76b8b13304617ed933902fee3830 (diff) |
From Fred Fierling:
Infinite loop in ZCL Discover Attributes dissection
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5303
svn path=/trunk/; revision=34575
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-zbee-zcl.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 86d3d56349..99a372a556 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -777,8 +777,8 @@ static void dissect_zcl_read_attr_resp(tvbuff_t *tvb, packet_info *pinfo _U_, pr /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 0, "Status Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; /* Dissect the attribute identifier */ dissect_zcl_attr_id(tvb, sub_tree, offset); @@ -824,8 +824,9 @@ static void dissect_zcl_write_attr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 0, "Attribute Field"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; + /* Dissect the attribute identifier */ dissect_zcl_attr_id(tvb, sub_tree, offset); @@ -865,8 +866,8 @@ static void dissect_zcl_write_attr_resp(tvbuff_t *tvb, packet_info *pinfo _U_, p /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 0, "Status Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; /* Dissect the status */ if ( dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_status) != @@ -911,8 +912,9 @@ static void dissect_zcl_read_report_config_resp(tvbuff_t *tvb, packet_info *pinf /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 3, "Reporting Configuration Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; + /* Dissect the status */ attr_status = dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_status); @@ -978,8 +980,8 @@ static void dissect_zcl_config_report(tvbuff_t *tvb, packet_info *pinfo _U_, pro /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 3, "Reporting Configuration Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; /* Dissect the direction and any reported configuration */ if ( dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_dir) @@ -1044,8 +1046,8 @@ static void dissect_zcl_config_report_resp(tvbuff_t *tvb, packet_info *pinfo _U_ /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 3, "Attribute Status Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; /* Dissect the status */ if ( dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_status) != @@ -1091,8 +1093,8 @@ static void dissect_zcl_read_report_config(tvbuff_t *tvb, packet_info *pinfo _U_ /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 3, "Attribute Status Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; } + i++; /* Dissect the direction */ dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_dir); @@ -1195,14 +1197,14 @@ static void dissect_zcl_discover_attr_resp(tvbuff_t *tvb, packet_info *pinfo _U_ /* Create subtree for attribute status field */ ti = proto_tree_add_text(tree, tvb, *offset, 3, "Attribute Status Record"); sub_tree = proto_item_add_subtree(ti, ett_zbee_zcl_attr[i]); - i++; + } + i++; - /* Dissect the attribute identifier */ - dissect_zcl_attr_id(tvb, sub_tree, offset); + /* Dissect the attribute identifier */ + dissect_zcl_attr_id(tvb, sub_tree, offset); - /* Dissect the number of maximum attribute identifiers */ - dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_data_type); - } + /* Dissect the number of maximum attribute identifiers */ + dissect_zcl_attr_uint8(tvb, sub_tree, offset, &hf_zbee_zcl_attr_data_type); } return; |