diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2017-04-22 13:17:37 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-22 13:08:51 +0000 |
| commit | c70d2ec8069b113aa575817535b19be52e6e635b (patch) | |
| tree | 3907e90392fd2dc21ab87efddf68b05207999b0c /epan/dissectors/asn1/ros | |
| parent | 951ac6c230c0397767ac4bfc1b5aa668330dd68d (diff) | |
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 <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/asn1/ros')
| -rw-r--r-- | epan/dissectors/asn1/ros/packet-ros-template.c | 2 |
1 files changed, 1 insertions, 1 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); |