diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-06-07 07:27:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-06-07 07:27:35 +0000 |
| commit | 2aad75bb826b45ee1a78be2bbe2687e488748f8b (patch) | |
| tree | fc165ec22e943d3b15a10b6c8c84359286432e05 /wiretap/iptrace.c | |
| parent | c15486768a2d90fcf97ca8ea628f3d174ad11a5b (diff) | |
| download | wireshark-2aad75bb826b45ee1a78be2bbe2687e488748f8b.tar.gz wireshark-2aad75bb826b45ee1a78be2bbe2687e488748f8b.tar.bz2 wireshark-2aad75bb826b45ee1a78be2bbe2687e488748f8b.zip | |
Graeme Hewson noted that zlib has a bug wherein "gzseek()" doesn't set
the internal z_err value for the stream if an "fseek()" call it makes
fails, so that if "gzerror()" is subsequently called, it returns Z_OK
rather than an error.
To work around this, we pass "file_seek()" an "int *err", and have the
with-zlib version of "file_seek()" check, if "gzseek()" fails, whether
the return value of "file_error()" is 0 and, if so, have it return
"errno" instead.
svn path=/trunk/; revision=5642
Diffstat (limited to 'wiretap/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index bbd89ddba3..945d842cdf 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -1,6 +1,6 @@ /* iptrace.c * - * $Id: iptrace.c,v 1.40 2002/04/30 18:58:16 guy Exp $ + * $Id: iptrace.c,v 1.41 2002/06/07 07:27:34 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -172,10 +172,8 @@ static gboolean iptrace_seek_read_1_0(wtap *wth, long seek_off, int ret; guint8 header[30]; - if (file_seek(wth->random_fh, seek_off, SEEK_SET) == -1) { - *err = file_error(wth->random_fh); + if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; - } /* Read the descriptor data */ ret = iptrace_read_rec_header(wth->random_fh, header, 30, err); @@ -295,10 +293,8 @@ static gboolean iptrace_seek_read_2_0(wtap *wth, long seek_off, int ret; guint8 header[40]; - if (file_seek(wth->random_fh, seek_off, SEEK_SET) == -1) { - *err = file_error(wth->random_fh); + if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; - } /* Read the descriptor data */ ret = iptrace_read_rec_header(wth->random_fh, header, 40, err); |