diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-10-21 19:18:15 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-10-22 02:27:32 +0000 |
| commit | 10ca4c7527122efde0300205deaa6c0143f07219 (patch) | |
| tree | 5352128043afff3b586c4a314ab2d240aec36f6a /wiretap/commview.c | |
| parent | 49cf42c571f3f94632957371ccd99533e71764ff (diff) | |
| download | wireshark-10ca4c7527122efde0300205deaa6c0143f07219.tar.gz | |
More checks for localtime() and gmtime() returning NULL.
And some comments in the case where we're converting the result of
time() - if your machine's idea of time predates January 1, 1970,
00:00:00 UTC, it'll crash on Windows, but that's not a case where a
*file* can cause the problem due either to a bad file time stamp or bad
time stamps in the file.
Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498
Reviewed-on: https://code.wireshark.org/review/18369
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/commview.c')
| -rw-r--r-- | wiretap/commview.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/wiretap/commview.c b/wiretap/commview.c index f44dbe5578..e6dbd8101f 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -422,13 +422,26 @@ static gboolean commview_dump(wtap_dumper *wdh, cv_hdr.version = 0; tm = localtime(&phdr->ts.secs); - cv_hdr.year = tm->tm_year + 1900; - cv_hdr.month = tm->tm_mon + 1; - cv_hdr.day = tm->tm_mday; - cv_hdr.hours = tm->tm_hour; - cv_hdr.minutes = tm->tm_min; - cv_hdr.seconds = tm->tm_sec; - cv_hdr.usecs = GUINT32_TO_LE(phdr->ts.nsecs / 1000); + if (tm != NULL) { + cv_hdr.year = tm->tm_year + 1900; + cv_hdr.month = tm->tm_mon + 1; + cv_hdr.day = tm->tm_mday; + cv_hdr.hours = tm->tm_hour; + cv_hdr.minutes = tm->tm_min; + cv_hdr.seconds = tm->tm_sec; + cv_hdr.usecs = GUINT32_TO_LE(phdr->ts.nsecs / 1000); + } else { + /* + * Second before the Epoch. + */ + cv_hdr.year = 1969; + cv_hdr.month = 12; + cv_hdr.day = 31; + cv_hdr.hours = 23; + cv_hdr.minutes = 59; + cv_hdr.seconds = 59; + cv_hdr.usecs = 0; + } switch(phdr->pkt_encap) { |