osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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 <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2017-11-11 15:14:45 +01:00
parent eaee0678ce
commit 73329d786b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-dvbci.c
View File

@ -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);