diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-02 02:07:42 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-02 02:07:42 +0000 |
| commit | 42a64c355786131ea8617cc50ae47f255c1ea8d2 (patch) | |
| tree | 0d7050a2fd6898c22719a3b635118e11624f6842 /epan/dissectors/packet-acse.c | |
| parent | a9900375b49ecd887f3561707e7b97a58bfac556 (diff) | |
If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly.
svn path=/trunk/; revision=53706
Diffstat (limited to 'epan/dissectors/packet-acse.c')
| -rw-r--r-- | epan/dissectors/packet-acse.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index dc37ecf9fb..d1d6c57048 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1708,6 +1708,10 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + /* do we have spdu type from the session dissector? */ + if( data == NULL){ + return 0; + } /* first, try to check length */ /* do we have at least 2 bytes */ @@ -1717,13 +1721,6 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d "User data"); return 0; /* no, it isn't a ACSE PDU */ } - /* do we have spdu type from the session dissector? */ - if( data == NULL){ - if(parent_tree){ - REPORT_DISSECTOR_BUG("Can't get SPDU type from session dissector."); - } - return 0; - } session = ( (struct SESSION_DATA_STRUCTURE*)data); if(session->spdu_type == 0 ) { @@ -1748,7 +1745,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d case SES_DISCONNECT: /* RLRQ */ case SES_FINISH: /* RLRE */ case SES_ABORT: /* ABRT */ - case CLSES_UNIT_DATA: /* AARQ Connetctionless session */ + case CLSES_UNIT_DATA: /* AARQ Connetctionless session */ break; case SES_DATA_TRANSFER: oid=find_oid_by_pres_ctx_id(pinfo, indir_ref); @@ -1799,7 +1796,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d break; } } - + top_tree = NULL; return tvb_length(tvb); } @@ -2242,7 +2239,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 271 "../../asn1/acse/packet-acse-template.c" +#line 268 "../../asn1/acse/packet-acse-template.c" }; /* List of subtrees */ @@ -2288,7 +2285,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 277 "../../asn1/acse/packet-acse-template.c" +#line 274 "../../asn1/acse/packet-acse-template.c" }; static ei_register_info ei[] = { |