diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-11-19 10:11:37 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-11-19 15:52:44 +0000 |
| commit | e9d8eba4163b515b58bfc0b8614a34876b2628a8 (patch) | |
| tree | 9fdb9a1c20e3cb226dd3b402d3fce50768339675 /epan | |
| parent | d6b3fcfeabdec2fee8804e2e7a779606dba432bd (diff) | |
packet-h223.c: Ensure conversation data exists
There is more potential for conversation data than previous circuit data
so ensure h223 conversation data exists in retrieved conversation.
Bug: 14233
Change-Id: I7074b1c110d40b4727812d0ef4f5391b6d2c0c33
Reviewed-on: https://code.wireshark.org/review/24492
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-h223.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 60c3eecb6c..4d41900d77 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -575,7 +575,8 @@ h223_set_mc( packet_info* pinfo, guint8 mc, h223_mux_element* me) * the new mux entry */ if(circ) { vc_info = (h223_vc_info *)conversation_get_proto_data(circ, proto_h223); - add_h223_mux_element( &(vc_info->call_info->direction_data[pinfo->p2p_dir ? 0 : 1]), mc, me, pinfo->num ); + if (vc_info != NULL) + add_h223_mux_element( &(vc_info->call_info->direction_data[pinfo->p2p_dir ? 0 : 1]), mc, me, pinfo->num ); } } @@ -590,7 +591,8 @@ h223_add_lc( packet_info* pinfo, guint16 lc, h223_lc_params* params ) * the new channel */ if(circ) { vc_info = (h223_vc_info *)conversation_get_proto_data(circ, proto_h223); - init_logical_channel( pinfo->num, vc_info->call_info, lc, pinfo->p2p_dir, params ); + if (vc_info != NULL) + init_logical_channel( pinfo->num, vc_info->call_info, lc, pinfo->p2p_dir, params ); } } |