path: root/text2pcap.c
diff options
authorGuy Harris <guy@alum.mit.edu>2016-10-21 19:18:15 -0700
committerGuy Harris <guy@alum.mit.edu>2016-10-22 02:27:32 +0000
commit10ca4c7527122efde0300205deaa6c0143f07219 (patch)
tree5352128043afff3b586c4a314ab2d240aec36f6a /text2pcap.c
parent49cf42c571f3f94632957371ccd99533e71764ff (diff)
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 'text2pcap.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/text2pcap.c b/text2pcap.c
index 855df5e54c..65d6547b45 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -1801,6 +1801,7 @@ parse_options (int argc, char *argv[])
ts_sec = time(0); /* initialize to current time */
+ /* We trust the OS to return a time after the Epoch. */
timecode_default = *localtime(&ts_sec);
timecode_default.tm_isdst = -1; /* Unknown for now, depends on time given to the strptime() function */