diff options
| author | Dario Lombardo <lomato@gmail.com> | 2019-02-27 15:02:01 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-02-27 16:44:06 +0000 |
| commit | 2f048c932d0c063bd53651d0fd8f31a66eede741 (patch) | |
| tree | 2d0bac4c6564a53aec9b291378498df75d059f6c /epan/dissectors/packet-rpcap.c | |
| parent | 812afa8065468f1c2d9fef864cc696bf8c227a36 (diff) | |
rpcap: check conversation existence before dereferencing it.
Bug: 15536
Change-Id: I370b7f4b3f647243490cbfadc120f0198c62b09b
Reviewed-on: https://code.wireshark.org/review/32232
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rpcap.c')
| -rw-r--r-- | epan/dissectors/packet-rpcap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index ace767ab15..14449ad9f5 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -1141,7 +1141,8 @@ dissect_rpcap_heur_tcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi * as such. */ conversation_t *conversation = find_conversation_pinfo (pinfo, 0); - conversation_set_dissector_from_frame_number (conversation, + if (conversation) + conversation_set_dissector_from_frame_number (conversation, pinfo->num, rpcap_tcp_handle); tcp_dissect_pdus (tvb, pinfo, tree, rpcap_desegment, 8, |