git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3e02e6
)
Don't try to process timestamp without the format being
author
tuexen
<tuexen@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 3 Jan 2013 09:23:43 +0000
(09:23 +0000)
committer
tuexen
<tuexen@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 3 Jan 2013 09:23:43 +0000
(09:23 +0000)
specified.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46910
f5534014
-38df-0310-8fa8-
9805f1628bb7
text2pcap.c
patch
|
blob
|
history
diff --git
a/text2pcap.c
b/text2pcap.c
index 426e64acf356595a6a7f0854886ca2d851556ecd..3243410a19f38b395acf785bcb85e61e50e6237e 100644
(file)
--- 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.