aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-12-11 21:43:53 -0500
committerMichael Mann <mmann78@netscape.net>2015-12-12 14:07:08 +0000
commit9352616ec9742f2ed3d2802d0c8c100d51ca410b (patch)
treeb2b436923a2fca93234e9b0f458c85c30ec7b347 /epan
parentb2b9b22fe9adf6758ea84940ec7c54d7675288d6 (diff)
Range check ett_ array access.
Bug: 11830 Change-Id: I010093f0ee6f876161de0aca24ea5037616d0039 Reviewed-on: https://code.wireshark.org/review/12555 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-zbee-zcl-general.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index b63bd14f18..5f573c9101 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -5130,7 +5130,7 @@ dissect_zcl_pwr_prof_pwrprofstatersp(tvbuff_t *tvb, proto_tree *tree, guint *off
guint8 power_profile_count;
/* Retrieve "Total Profile Number" field */
- power_profile_count = tvb_get_guint8(tvb, *offset);
+ power_profile_count = MIN(tvb_get_guint8(tvb, *offset), ZBEE_ZCL_PWR_PROF_NUM_PWR_PROF_ETT);
proto_tree_add_item(tree, hf_zbee_zcl_pwr_prof_pwr_prof_count, tvb, *offset, 1, ENC_NA);
*offset += 1;