diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-03-26 16:03:03 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-03-26 22:21:26 +0000 |
| commit | 445a57bdc35f5f09ef878b6bf5a46d7018ddddcc (patch) | |
| tree | f8376ac0c9cb60969dc4a2087a90c33cfd6e7b94 /epan/dissectors/packet-dcm.c | |
| parent | 9dd085d3d675b649cf7d0f9122fcdfcc88a21f2a (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 62a5174bc4..95a9b98482 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -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, |