aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ndmp.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-09-01 08:29:50 +0200
committerEvan Huus <eapache@gmail.com>2014-09-01 16:16:06 +0000
commit9ee7c3860c076bad45715faf539fbefadad526e4 (patch)
treea46120604d054d8bab1d504d8ca2fa5a9502e44d /epan/dissectors/packet-ndmp.c
parent53dbc0ee82c693cbc1fc2b3609c3d79783f6cab3 (diff)
NDMP: Fix Dereference of null pointer found by Clang analyzer
Change-Id: I314e7e00633f93dead6a092e059336a304e4a946 Reviewed-on: https://code.wireshark.org/review/3940 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
-rw-r--r--epan/dissectors/packet-ndmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 18cc8d0c85..b7ff889259 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -3045,7 +3045,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
/* Reassemble if desegmentation and reassembly are enabled, otherwise
* just pass through and use the data in tvb for dissection */
- if (ndmp_defragment && ndmp_desegment)
+ if (data && ndmp_defragment && ndmp_desegment)
{
/*