Add back the fix from revision 54693.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54976 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index 83717116d1a6b96105b02e1af556adbcc904c8df..6375ab29322fcfe41a788fb5c84393900fbe331a 100644 (file)
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.c
@@ -272,6 +272,9 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
                        /* ROS won't do this for us */
                        session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT);
                        /*offset=*/dissect_ber_external_type(FALSE, tree, next_tvb, 0, &asn1_ctx, -1, call_rtse_external_type_callback);
+                       top_tree = NULL;
+                       /* Return other than 0 to indicate that we handled this packet */
+                       return 1;
                } else {
                        offset = tvb_length (tvb);
                }

diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index 77cbdaf18a2fbb9cfab613bbea8fe8d54e86534a..d1ffd97472dd9405a99fef8ce3184c816af3852e 100644 (file)
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -828,6 +828,9 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
                        /* ROS won't do this for us */
                        session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT);
                        /*offset=*/dissect_ber_external_type(FALSE, tree, next_tvb, 0, &asn1_ctx, -1, call_rtse_external_type_callback);
+                       top_tree = NULL;
+                       /* Return other than 0 to indicate that we handled this packet */
+                       return 1;
                } else {
                        offset = tvb_length (tvb);
                }
@@ -1004,7 +1007,7 @@ void proto_register_rtse(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-rtse-hfarr.c ---*/
-#line 351 "../../asn1/rtse/packet-rtse-template.c"
+#line 354 "../../asn1/rtse/packet-rtse-template.c"
   };
 
   /* List of subtrees */
@@ -1026,7 +1029,7 @@ void proto_register_rtse(void) {
     &ett_rtse_CallingSSuserReference,
 
 /*--- End of included file: packet-rtse-ettarr.c ---*/
-#line 360 "../../asn1/rtse/packet-rtse-template.c"
+#line 363 "../../asn1/rtse/packet-rtse-template.c"
   };
 
   static ei_register_info ei[] = {