diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-09 22:23:44 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-09 22:23:44 +0000 |
| commit | 79fa0d0a3fa8ebb91fac92fda1274957fc55bcd4 (patch) | |
| tree | 9a714a0dfd512884ae08640817e2783d528d0bf3 /epan/dissectors/packet-rtse.c | |
| parent | e3c369eb6786e8f17e3e8ce6da027012511566b8 (diff) | |
Reject the packet if data is NULL without doing anything else.
Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors. Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT().
svn path=/trunk/; revision=53895
Diffstat (limited to 'epan/dissectors/packet-rtse.c')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 7e2607b816..2dd38cd793 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -763,19 +763,13 @@ dissect_rtse(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); - /* save parent_tree so subdissectors can create new top nodes */ - top_tree=parent_tree; - - /* do we have application context from the acse dissector? */ - if( data == NULL ){ - if(parent_tree){ - proto_tree_add_text(parent_tree, tvb, offset, -1, - "Internal error:can't get application context from ACSE dissector."); - } + /* do we have application context from the acse dissector? */ + if (data == NULL) return 0; - } + session = (struct SESSION_DATA_STRUCTURE*)data; - session = ( (struct SESSION_DATA_STRUCTURE*)data); + /* save parent_tree so subdissectors can create new top nodes */ + top_tree=parent_tree; asn1_ctx.private_data = session; @@ -1010,7 +1004,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 357 "../../asn1/rtse/packet-rtse-template.c" +#line 351 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1032,7 +1026,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 366 "../../asn1/rtse/packet-rtse-template.c" +#line 360 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { |