From 9e44a0940a865fd4bbe0535c351a1779b0bd445c Mon Sep 17 00:00:00 2001 From: Gregor Beck Date: Thu, 25 Oct 2012 08:00:59 +0200 Subject: [PATCH] MSWSP: avoid segfault if no fid_info is found --- epan/dissectors/packet-mswsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index 6beb2e7316..0a6aa43bf0 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -2569,8 +2569,8 @@ static int dissect_mswsp_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } } - if ((fid_info->fsi == NULL) || (fid_info->fsi->filename == NULL)) { - fprintf(stderr, " no %s\n", fid_info->fsi ? "filename" : "fsi"); + if (!fid_info || !fid_info->fsi || !fid_info->fsi->filename) { + fprintf(stderr, " no %s\n", fid_info ? (fid_info->fsi ? "filename" : "fsi") : "fid_info"); return 0; } -- 2.11.4.GIT