From be3f30b2381039451368551abec746f295934d28 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 11 Jun 2019 01:42:26 +0200 Subject: [PATCH] Diameter 3GPP: Avoid dereference reported by VS2019. Change-Id: I63dee0897d8a8ee4efbc525f9de3938349fb849e Reviewed-on: https://code.wireshark.org/review/33552 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-diameter_3gpp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 19e0962d2e..eedcabf21a 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -888,11 +888,12 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ guint32 application_id = 0, feature_list_id = 0; diam_sub_dis_t *diam_sub_dis_inf = (diam_sub_dis_t*)data; - if(diam_sub_dis_inf) { - application_id = diam_sub_dis_inf->application_id; - feature_list_id = diam_sub_dis_inf->feature_list_id; + if(!diam_sub_dis_inf) { + return 4; } + application_id = diam_sub_dis_inf->application_id; + feature_list_id = diam_sub_dis_inf->feature_list_id; /* Hide the item created in packet-diameter.c and only show the one created here */ proto_item_set_hidden(diam_sub_dis_inf->item);