osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make sure conversation exists (CID-280536) 

The code sets up a conversation, then proceeds getting it
and using it. It must be there, so assert that it is before
dereferencing it.

Change-Id: I5384b9b773a5f4e86f649612ee4f4929a503c523
Reviewed-on: https://code.wireshark.org/review/14641
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jaap Keuter 2016-03-26 16:03:03 +01:00 committed by Anders Broman
parent 9dd085d3d6
commit 445a57bdc3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-dcm.c
View File

@ -6686,6 +6686,8 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Try to create somewhat unique ID.
Include the conversation index, to separate TCP session
*/
DISSECTOR_ASSERT(conv);
reassembly_id = (((conv->index) & 0x00FFFFFF) << 8) + pdv->pctx_id;
head = fragment_add_seq_next(&dcm_pdv_reassembly_table,