diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-08-30 19:43:32 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-08-30 19:43:32 +0000 |
| commit | e66bb9e6919b9ac08fcf5194db2d08fd9c5f860f (patch) | |
| tree | 04f5537e1a2ff53175b5056371afdd4232823626 /asn1 | |
| parent | 2da0e8624486d503d4c25d8552980f6bc622d214 (diff) | |
| download | wireshark-e66bb9e6919b9ac08fcf5194db2d08fd9c5f860f.tar.gz wireshark-e66bb9e6919b9ac08fcf5194db2d08fd9c5f860f.tar.bz2 wireshark-e66bb9e6919b9ac08fcf5194db2d08fd9c5f860f.zip | |
Break out of an infinite loop. Fixes bugs 392 - 395. Add a UNIX Makefile
for generation of the PRES dissector.
svn path=/trunk/; revision=15626
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pres/Makefile | 17 | ||||
| -rw-r--r-- | asn1/pres/packet-pres-template.c | 11 |
2 files changed, 22 insertions, 6 deletions
diff --git a/asn1/pres/Makefile b/asn1/pres/Makefile new file mode 100644 index 0000000000..e9187541e2 --- /dev/null +++ b/asn1/pres/Makefile @@ -0,0 +1,17 @@ +# $Id: Makefile 15178 2005-08-02 05:21:19Z jmayer $ + +DISSECTOR_FILES=packet-pres.c packet-pres.h + +all: generate_dissector + +generate_dissector: $(DISSECTOR_FILES) + +$(DISSECTOR_FILES): ../../tools/asn2eth.py ISO8823-PRESENTATION.asn packet-pres-template.c packet-pres-template.h pres.cnf + python ../../tools/asn2eth.py -X -b -e -p pres -c pres.cnf -s packet-pres-template ISO8823-PRESENTATION.asn + +clean: + rm -f parsetab.py $(DISSECTOR_FILES) + +copy_files: generate_dissector + cp $(DISSECTOR_FILES) ../../epan/dissectors + diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index aca594e852..39202beb6b 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -136,7 +136,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)){ @@ -157,12 +157,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); } } } |