diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-12 19:10:24 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-12 19:10:24 +0000 |
| commit | c21370b0f4f32f9e8712ce0ac02aaefffc84c61b (patch) | |
| tree | 8fc9a623a79dd96b42cf6bd865a1038f9217b0a4 /epan/dissectors/packet-ndmp.c | |
| parent | 4b609d4c9204dfd2814e5a63dfe79eb00cbf37b3 (diff) | |
Reject the packet if data is NULL under conditions where it'll be used.
svn path=/trunk/; revision=53966
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 08ea2de56c..9adc83b494 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3101,6 +3101,10 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* tvbuff_t* new_tvb = NULL; fragment_head *frag_msg = NULL; + /* Reject the packet if data is NULL under conditions where it'll be used */ + if (data == NULL && ndmp_defragment && ndmp_desegment) + return 0; + top_tree=tree; /* scsi should open its expansions on the top level */ /* |