diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-05-16 17:02:22 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-05-16 17:02:22 +0000 |
| commit | 21a1231e31ee1a4562d2bbd3bc500e5655b3c0a5 (patch) | |
| tree | 329b573875c076ac10d0541ca410d8cdfb20caee /epan/dissectors/packet-netflow.c | |
| parent | 195332c93a36869e67fa8e71892c608b15d05abb (diff) | |
Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will seg-fault on that.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37181 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index a078e1d5e3..4284bdd6a4 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -4791,7 +4791,7 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, ti = proto_tree_add_bytes_format_value(pdutree, hf_ipfix_enterprise_private_entry, tvb, offset, length, NULL, "(%s) Type %u: Value (hex bytes): %s", - pen_str, + pen_str ? pen_str : "(null)", masked_type, tvb_bytes_to_str_punct(tvb, offset, length, ' ')); } @@ -6092,7 +6092,7 @@ proto_register_netflow(void) FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL} }, - {&hf_cflow_permanent_packets, + {&hf_cflow_permanent_packets, {"Permanent Packets", "cflow.permanent_packets", FT_UINT32, BASE_DEC, NULL, 0x0, "Running Count of packets for permanent flows", HFILL} |