diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2007-11-19 07:25:06 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2007-11-19 07:25:06 +0000 |
| commit | 77e69e06e193df47ef99cc1cf24dd305c2395ba2 (patch) | |
| tree | 73fed26d786c831d3813671deb2bbcf3bf9d6d8d /epan | |
| parent | 64fe05e583bcdad2eba528c3b8d45bcf972f1bd8 (diff) | |
Reverted r23485 and r23486, this was not a correct fix.
svn path=/trunk/; revision=23489
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index eb599b9ddd..fbd4c0eaaf 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -2560,18 +2560,6 @@ printf("CHOICE dissect_ber_choice(%s) entered len:%d\n",name,tvb_length_remainin offset=get_ber_length(tvb, offset, &len, &ind); end_offset = offset + len ; - /* do not stop processing if the length has the (illegal) value of zero */ - if(len == 0) { - if(show_internal_ber_fields) { - offset=dissect_ber_identifier(actx->pinfo, tree, tvb, start_offset, NULL, NULL, NULL); - offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, NULL, NULL); - } - item = proto_tree_add_text(tree, tvb, offset, len, "BER Error: Empty choice field was found"); - proto_item_set_expert_flags(item, PI_MALFORMED, PI_WARN); - expert_add_info_format(actx->pinfo, item, PI_MALFORMED, PI_WARN, "BER Error: Empty choice field was found"); - return offset; - } - /* Some sanity checks. * The hf field passed to us MUST be an integer type */ @@ -2798,18 +2786,6 @@ printf("CHOICE dissect_ber_old_choice(%s) entered len:%d\n",name,tvb_length_rema offset=get_ber_length(tvb, offset, &len, &ind); end_offset = offset + len ; - /* do not stop processing if the length has the (illegal) value of zero */ - if(len == 0) { - if(show_internal_ber_fields) { - offset=dissect_ber_identifier(actx->pinfo, tree, tvb, start_offset, NULL, NULL, NULL); - offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, NULL, NULL); - } - item = proto_tree_add_text(tree, tvb, offset, len, "BER Error: Empty choice field was found"); - proto_item_set_expert_flags(item, PI_MALFORMED, PI_WARN); - expert_add_info_format(actx->pinfo, item, PI_MALFORMED, PI_WARN, "BER Error: Empty choice field was found"); - return offset; - } - /* Some sanity checks. * The hf field passed to us MUST be an integer type */ |