From 73329d786ba6643784dc0c31cede88ad4da7db4a Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sat, 11 Nov 2017 15:14:45 +0100 Subject: [PATCH] DVB-CI: ensure that conversation_t stucture exists before using it Bug: 14202 Change-Id: Ie0cad9c1cd1d0ea1392a61194567e80bb2b5a566 Reviewed-on: https://code.wireshark.org/review/24345 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-dvbci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index fbfb53cca3..b18f049516 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -3892,7 +3892,7 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field, msg_tvb = tvb_new_subset_remaining(tvb, offset); if (!msg_tvb) break; - if (dvbci_dissect_lsc_msg && conversation_get_dissector(conv, 0)) { + if (dvbci_dissect_lsc_msg && conv && conversation_get_dissector(conv, 0)) { msg_handle = conversation_get_dissector(conv, 0); col_append_str(pinfo->cinfo, COL_INFO, ", "); col_set_fence(pinfo->cinfo, COL_INFO); @@ -4133,7 +4133,7 @@ dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; msg_tvb = tvb_new_subset_length(tvb, offset, msg_len); - msg_handle = conversation_get_dissector(conv, 0); + msg_handle = conv ? conversation_get_dissector(conv, 0) : NULL; if (msg_handle == NULL) msg_handle = data_handle; call_dissector(msg_handle, msg_tvb, pinfo, tree);