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 /asn1/p1/packet-p1-template.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 'asn1/p1/packet-p1-template.c')
| -rw-r--r-- | asn1/p1/packet-p1-template.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index bd73ccdabb..10ca12e484 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -235,19 +235,13 @@ dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat 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 */ - p1_initialize_content_globals (&asn1_ctx, parent_tree, TRUE); - - /* do we have operation information from the ROS dissector? */ - if( data == NULL ){ - if(parent_tree){ - proto_tree_add_text(parent_tree, tvb, offset, -1, - "Internal error: can't get operation information from ROS dissector."); - } + /* do we have operation information from the ROS 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 */ + p1_initialize_content_globals (&asn1_ctx, parent_tree, TRUE); asn1_ctx.private_data = session; |