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/ros | |
| parent | e3c369eb6786e8f17e3e8ce6da027012511566b8 (diff) | |
| download | wireshark-79fa0d0a3fa8ebb91fac92fda1274957fc55bcd4.tar.gz wireshark-79fa0d0a3fa8ebb91fac92fda1274957fc55bcd4.tar.bz2 wireshark-79fa0d0a3fa8ebb91fac92fda1274957fc55bcd4.zip | |
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/ros')
| -rw-r--r-- | asn1/ros/packet-ros-template.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 35dfad34da..967916d541 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -384,19 +384,14 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + /* do we have application context from the acse dissector? */ + if (data == NULL) + return 0; + asn1_ctx.private_data = data; + /* 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){ - if(parent_tree){ - proto_tree_add_text(parent_tree, tvb, offset, -1, - "Internal error:can't get application context from ACSE dissector."); - } - return 0; - } - - asn1_ctx.private_data = data; conversation = find_or_create_conversation(pinfo); /* |