aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ber.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2007-08-13 16:41:16 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2007-08-13 16:41:16 +0000
commit2aa5ef90682bd9dbecc23477a1030a02d3d8952e (patch)
tree8b221916459ce43f6576abf3a9d1bc07ef215546 /epan/dissectors/packet-ber.c
parentcc877645a3f9fbe29cd7dad13ef8e0688667777f (diff)
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1739
Fro Stig Bjørlykke: 1. BER: Added support for empty indef SET 2. RTSE: Added fragment length in COL_INFO 3. IMF: Use correct hf_id for extension value 4. DOP: Fix typo in COL_INFO oid name git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22492 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ber.c')
-rw-r--r--epan/dissectors/packet-ber.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 50b4064191..32f112c08a 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -2117,7 +2117,7 @@ printf("SET dissect_ber_set(%s) calling subdissector\n",name);
/* if we consumed some bytes,
or we knew the length was zero (during the first pass only) */
- if(count || (first_pass && (len == 0))) {
+ if(count || (first_pass && (len == 0 || (ind_field == 1 && len == 2)))) {
/* we found it! */
if(set_idx < MAX_SET_ELEMENTS)
mandatory_fields &= ~(1 << set_idx);
@@ -2378,7 +2378,7 @@ printf("SET dissect_old_ber_set(%s) calling subdissector\n",name);
/* if we consumed some bytes,
or we knew the length was zero (during the first pass only) */
- if(count || (first_pass && (len == 0))) {
+ if(count || (first_pass && (len == 0 || (ind_field == 1 && len == 2)))) {
/* we found it! */
if(set_idx < MAX_SET_ELEMENTS)
mandatory_fields &= ~(1 << set_idx);