From 48a66835ee4f319ba7806a542bb2cf1f16a2ac06 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 28 Sep 2016 16:45:23 -0700 Subject: Use wtap_read_bytes() to skip over bytes when reading a record. Allow file_read() to take a null pointer as a buffer argument; a null argument means "do everything except copy the bytes from the file to the user buffer". That means that wtap_read_bytes() and wtap_read_bytes_or_eof() also support a null pointer as a buffer argument. Use wtap_read_bytes() with a null buffer argument rather than file_skip() to skip forward over data. This fixes some places where files were mis-identified as ERF files, as the ERF open heuristics now get a short "read" error if they try to skip over more bytes than exist in the file. Change-Id: I4f73499d877c1f582e2bcf9b045034880cb09622 Reviewed-on: https://code.wireshark.org/review/17974 Reviewed-by: Guy Harris --- wiretap/iptrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/iptrace.c') diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 235b317251..bfa278b3f5 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -178,7 +178,7 @@ iptrace_read_rec_1_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, /* * Skip the padding. */ - if (!file_skip(fh, 3, err)) + if (!wtap_read_bytes(fh, NULL, 3, err, err_info)) return FALSE; } if (packet_size > WTAP_MAX_PACKET_SIZE) { @@ -371,7 +371,7 @@ iptrace_read_rec_2_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, /* * Skip the padding. */ - if (!file_skip(fh, 3, err)) + if (!wtap_read_bytes(fh, NULL, 3, err, err_info)) return FALSE; } if (packet_size > WTAP_MAX_PACKET_SIZE) { -- cgit v1.2.3