aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bootp.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-05-30 20:53:08 +0000
committerGerald Combs <gerald@wireshark.org>2005-05-30 20:53:08 +0000
commit1d3ba8764b7cdc2122f3823bd25d00578eaa9e7a (patch)
treee531071b1f6a63feb688547e80865b4100b1fe8d /epan/dissectors/packet-bootp.c
parent651ee9a2fe444f23e884d6baf88235309734ef14 (diff)
From Steve Grubb: Fix off by one errors. Fixes part of bug 217.
svn path=/trunk/; revision=14494
Diffstat (limited to 'epan/dissectors/packet-bootp.c')
-rw-r--r--epan/dissectors/packet-bootp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index f15357508f..df02adc5b6 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -1423,7 +1423,7 @@ dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb,
"Suboption %d: %s (%d byte%s)" ,
subopt, "PXE boot item",
subopt_len, plurality(subopt_len, "", "s"));
- } else if ((subopt < 1) || (subopt > array_length(o43pxeclient_opt))) {
+ } else if ((subopt < 1) || (subopt >= array_length(o43pxeclient_opt))) {
proto_tree_add_text(v_tree, tvb, optoff, subopt_len+2,
"Unknown suboption %d (%d byte%s)", subopt, subopt_len,
plurality(subopt_len, "", "s"));
@@ -1589,7 +1589,7 @@ dissect_vendor_cablelabs_suboption(proto_tree *v_tree, tvbuff_t *tvb,
subopt);
return (optend);
}
- if ( (subopt < 1 ) || (subopt > array_length(o43cablelabs_opt)) ) {
+ if ( (subopt < 1 ) || (subopt >= array_length(o43cablelabs_opt)) ) {
proto_tree_add_text(v_tree, tvb, optoff, subopt_len+2,
"Suboption %d: Unassigned (%d byte%s)", subopt, subopt_len,
plurality(subopt_len, "", "s"));
@@ -1712,7 +1712,7 @@ dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb,
subopt_len = tvb_get_guint8(tvb, suboptoff);
suboptoff++;
- if (subopt > array_length(o63_opt)) {
+ if (subopt >= array_length(o63_opt)) {
proto_tree_add_text(v_tree, tvb, optoff, subopt_len + 2, "Unknown suboption %d", subopt);
} else {
switch (o63_opt[subopt].ftype) {