diff options
| author | Michael Tüxen <tuexen@wireshark.org> | 2014-06-04 19:20:20 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-04 17:42:56 +0000 |
| commit | 91afb5a36ed9f3fb0056ac3f9aff5d5eda22ba01 (patch) | |
| tree | 10390ebf99401691882fb87cb26245f434c5d262 /wiretap/wtap.c | |
| parent | a4c306185b2355972ea72a9d16d6d86ff18097c6 (diff) | |
The subtype_seek_read() functions populate *phdr, not wth->phdr.
So don't use the values.
This problem show up on pcapng files resulting from captures of
multiple interfaces.
Change-Id: I30b0598602b0b69233107d35be4360475d8648d8
Reviewed-on: https://code.wireshark.org/review/1950
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index f193a04ea8..46b2412467 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1084,8 +1084,8 @@ wtap_seek_read(wtap *wth, gint64 seek_off, * It makes no sense for the captured data length to be bigger * than the actual data length. */ - if (wth->phdr.caplen > wth->phdr.len) - wth->phdr.caplen = wth->phdr.len; + if (phdr->caplen > phdr->len) + phdr->caplen = phdr->len; /* * Make sure that it's not WTAP_ENCAP_PER_PACKET, as that @@ -1093,7 +1093,7 @@ wtap_seek_read(wtap *wth, gint64 seek_off, * but the read routine didn't set this packet's * encapsulation type. */ - g_assert(wth->phdr.pkt_encap != WTAP_ENCAP_PER_PACKET); + g_assert(phdr->pkt_encap != WTAP_ENCAP_PER_PACKET); return TRUE; } |