diff options
| author | Bill Meier <wmeier@newsguy.com> | 2015-01-19 15:15:45 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2015-01-19 20:50:26 +0000 |
| commit | 7e1d73d0d4d4852f14d5ac3e2dcf699d0467043b (patch) | |
| tree | 5826d3b213132f353c834aec4c620b9dc65764d2 /epan/dissectors/packet-vssmonitoring.c | |
| parent | d1cace99e57643a8f836803b2bc9cac50e42ac98 (diff) | |
dmp, gmhdr, vssmonitoring: prevent possible crashes;
gmtime()/localtime() can return NULL.
Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6
Reviewed-on: https://code.wireshark.org/review/6660
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-vssmonitoring.c')
| -rw-r--r-- | epan/dissectors/packet-vssmonitoring.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c index 6679785d13..565a36bc75 100644 --- a/epan/dissectors/packet-vssmonitoring.c +++ b/epan/dissectors/packet-vssmonitoring.c @@ -172,8 +172,11 @@ dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_tree_add_uint(vssmonitoring_tree, hf_vssmonitoring_clksrc, tvb, offset + 4, 1, vssmonitoring_clksrc); tmp = localtime(&vssmonitoring_time.secs); - proto_item_append_text(ti, ", Timestamp: %02d:%02d:%02d.%09ld", - tmp->tm_hour, tmp->tm_min, tmp->tm_sec,(long)vssmonitoring_time.nsecs); + if (tmp) + proto_item_append_text(ti, ", Timestamp: %02d:%02d:%02d.%09ld", + tmp->tm_hour, tmp->tm_min, tmp->tm_sec,(long)vssmonitoring_time.nsecs); + else + proto_item_append_text(ti, ", Timestamp: <Not representable>"); } offset += 8; } |