diff options
Diffstat (limited to 'epan/dissectors/packet-pres.c')
| -rw-r--r-- | epan/dissectors/packet-pres.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index d49d7d418c..986571ff35 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-pres.c */ +/* ./packet-pres.c */ /* ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn */ /* Input file: packet-pres-template.c */ @@ -1687,7 +1687,7 @@ dissect_ppdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) void dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { - int offset = 0; + int offset = 0, old_offset; /* first, try to check length */ /* do we have at least 4 bytes */ if (!tvb_bytes_exist(tvb, 0, 4)){ @@ -1708,12 +1708,11 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) global_pinfo = pinfo; while (tvb_reported_length_remaining(tvb, offset) > 0){ - + old_offset = offset; offset = dissect_ppdu(tvb, offset, pinfo, parent_tree); - if(offset == FALSE ){ - proto_tree_add_text(parent_tree, tvb, offset, -1,"Internal error"); - offset = tvb_length(tvb); - break; + if(offset <= old_offset){ + proto_tree_add_text(parent_tree, tvb, offset, -1,"Invalid offset"); + THROW(ReportedBoundsError); } } } |