From c70d2ec8069b113aa575817535b19be52e6e635b Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Sat, 22 Apr 2017 13:17:37 +0200 Subject: [PATCH] ROS: Harden ROS dissection Make sure that on a OID search an actual OID is available to search for. Bug: 13637 Change-Id: I36f84cce5506f003d2a30a17f8671d5e22070612 Reviewed-on: https://code.wireshark.org/review/21280 Reviewed-by: Jaap Keuter Petri-Dish: Jaap Keuter Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/asn1/ros/packet-ros-template.c | 2 +- epan/dissectors/packet-ros.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/asn1/ros/packet-ros-template.c b/epan/dissectors/asn1/ros/packet-ros-template.c index eabe705df6..1c0a46839e 100644 --- a/epan/dissectors/asn1/ros/packet-ros-template.c +++ b/epan/dissectors/asn1/ros/packet-ros-template.c @@ -145,7 +145,7 @@ ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_item *item=NULL; proto_tree *ros_tree=NULL; - if((session != NULL) && ((rinfo = (ros_info_t*)wmem_map_lookup(protocol_table, oid)) != NULL)) { + if((session != NULL) && (oid != NULL) && ((rinfo = (ros_info_t*)wmem_map_lookup(protocol_table, oid)) != NULL)) { if(tree){ item = proto_tree_add_item(tree, *(rinfo->proto), tvb, 0, -1, ENC_NA); diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 38128bc48c..253264386c 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -199,7 +199,7 @@ ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_item *item=NULL; proto_tree *ros_tree=NULL; - if((session != NULL) && ((rinfo = (ros_info_t*)wmem_map_lookup(protocol_table, oid)) != NULL)) { + if((session != NULL) && (oid != NULL) && ((rinfo = (ros_info_t*)wmem_map_lookup(protocol_table, oid)) != NULL)) { if(tree){ item = proto_tree_add_item(tree, *(rinfo->proto), tvb, 0, -1, ENC_NA);