summaryrefslogtreecommitdiff
path: root/text2pcap.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2013-01-03 09:23:43 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2013-01-03 09:23:43 +0000
commit441b5b1bb567666c01f56b66346fd7f3b512be65 (patch)
tree824bfbea696bf32827b98b18163fedc0bd5195a1 /text2pcap.c
parent430e97c866dc2baec48a8eb253f31906b65f250c (diff)
downloadwireshark-441b5b1bb567666c01f56b66346fd7f3b512be65.tar.gz
Don't try to process timestamp without the format being
specified. svn path=/trunk/; revision=46910
Diffstat (limited to 'text2pcap.c')
-rw-r--r--text2pcap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/text2pcap.c b/text2pcap.c
index 426e64acf3..3243410a19 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -950,6 +950,11 @@ parse_preamble (void)
timecode = timecode_default;
ts_usec = 0;
+ if (ts_fmt == NULL) {
+ /* Clear Preamble */
+ packet_preamble_len = 0;
+ return;
+ }
/* Ensure preamble has more than two chars before attempting to parse.
* This should cover line breaks etc that get counted.