diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-05-08 20:43:22 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-05-09 03:43:53 +0000 |
commit | 270f0554d86ad5a7d6455f8eccbf057acdc69a91 (patch) | |
tree | 75a61724b3076a13b302aaa64868edc6befe95b8 /epan/dissectors/packet-logcat-text.c | |
parent | 29465751994416552d859bc1be051b5dae48ae0a (diff) |
You have to set tm_isdst before calling mktime().
You either need to tell mktime() that 1) DST/Summer Time is in effect,
2) DST/Summer Time isn't in effect, or 3) we don't know whether
DST/Summer Time is in effect, you figure it out.
We set tm_isdst to -1, to choose option 3), which is what we want.
Fixes Coverity CID 1435496.
Change-Id: Iff24e51807ab42c0e6d9629f72848ad9f8d325fb
Reviewed-on: https://code.wireshark.org/review/27404
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-logcat-text.c')
-rw-r--r-- | epan/dissectors/packet-logcat-text.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c index 1b0a754272..8601f3f330 100644 --- a/epan/dissectors/packet-logcat-text.c +++ b/epan/dissectors/packet-logcat-text.c @@ -163,6 +163,7 @@ static int get_time(const gchar *frame, const gchar *token, tvbuff_t *tvb, &date.tm_hour, &date.tm_min, &date.tm_sec, &ms)) { date.tm_year = 70; date.tm_mon -= 1; + date.tm_isdst = -1; seconds = mktime(&date); ts.secs = seconds; ts.nsecs = (int) (ms * 1e6); |