diff options
| author | Michael Mann <mmann78@netscape.net> | 2018-02-06 21:36:05 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-07 03:16:42 +0000 |
| commit | f4f44caa3525bb382f903f3abda387ccc0cad806 (patch) | |
| tree | 446c36e7e7f64c66fd67ff5c3050b0eb343e6fd1 | |
| parent | f29bafff465a072bb9c819598b1d900f50fea59c (diff) | |
FCP: Add NULL check to prevent crash.
Fragmented FCP may not be called on the first pass, so add a NULL
check for proto_data that may not be there.
Bug: 14374
Change-Id: Icbbee8f0eb3a33655323283dbb5a01c350d784dc
Reviewed-on: https://code.wireshark.org/review/25649
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-fcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 111cfe2020..84b8c91b8e 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -680,7 +680,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) proto_data = (fcp_proto_data_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fcp, 0); } - if ((r_ctl != FCP_IU_CMD) && (r_ctl != FCP_IU_UNSOL_CTL)) { + if ((r_ctl != FCP_IU_CMD) && (r_ctl != FCP_IU_UNSOL_CTL) && (proto_data != NULL)) { request_data = (fcp_request_data_t *)wmem_map_lookup(fcp_conv_data->luns, GUINT_TO_POINTER((guint)(proto_data->lun))); } |