Have "wtap_seek_read()" return 0 on success and -1 on failure, and take

an "err" argument that points to an "int" into which to put an error
code if it fails.

Check for errors in one call to it, and note that we should do so in
other places.

In the "wtap_seek_read()" call in the TCP graphing code, don't overwrite
"cfile.pseudo_header", and make the buffer into which we read the data
WTAP_MAX_PACKET_SIZE bytes, as it should be.

In some of the file readers for text files, check for errors from the
"parse the record header" and "parse the hex dump" routines when reading
sequentially.

In "csids_seek_read()", fix some calls to "file_error()" to check the
error on the random stream (that being what we're reading).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4874 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 17 insertions, 10 deletions

diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index a644f5e566..c356959286 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -1,6 +1,6 @@
 /* toshiba.c
  *
- * $Id: toshiba.c,v 1.21 2002/03/04 00:25:35 guy Exp $
+ * $Id: toshiba.c,v 1.22 2002/03/05 05:58:41 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -111,7 +111,7 @@ static const char toshiba_rec_magic[]  = { '[', 'N', 'o', '.' };
 
 static gboolean toshiba_read(wtap *wth, int *err, long *data_offset);
 static int toshiba_seek_read(wtap *wth, long seek_off,
-	union wtap_pseudo_header *pseudo_header, guint8 *pd, int len);
+	union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, int *err);
 static gboolean parse_single_hex_dump_line(char* rec, guint8 *buf, guint byte_offset);
 static int parse_toshiba_hex_dump(FILE_T fh, int pkt_len, guint8* buf, int *err);
 static int parse_toshiba_rec_hdr(wtap *wth, FILE_T fh,
@@ -239,15 +239,17 @@ static gboolean toshiba_read(wtap *wth, int *err, long *data_offset)
 		return FALSE;
 
 	/* Parse the header */
-	pkt_len = parse_toshiba_rec_hdr(wth, wth->fh,
-	    &wth->pseudo_header, err);
+	pkt_len = parse_toshiba_rec_hdr(wth, wth->fh, &wth->pseudo_header, err);
+	if (pkt_len == -1)
+		return FALSE;
 
 	/* Make sure we have enough room for the packet */
 	buffer_assure_space(wth->frame_buffer, TOSHIBA_MAX_PACKET_LEN);
 	buf = buffer_start_ptr(wth->frame_buffer);
 
 	/* Convert the ASCII hex dump to binary data */
-	parse_toshiba_hex_dump(wth->fh, pkt_len, buf, err);
+	if (parse_toshiba_hex_dump(wth->fh, pkt_len, buf, err) == -1)
+		return FALSE;
 
 	wth->data_offset = offset;
 	*data_offset = offset;
@@ -257,21 +259,26 @@ static gboolean toshiba_read(wtap *wth, int *err, long *data_offset)
 /* Used to read packets in random-access fashion */
 static int
 toshiba_seek_read (wtap *wth, long seek_off,
-	union wtap_pseudo_header *pseudo_header, guint8 *pd, int len)
+	union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, int *err)
 {
 	int	pkt_len;
-	int	err;
 
-	file_seek(wth->random_fh, seek_off - 1, SEEK_SET);
+	if (file_seek(wth->random_fh, seek_off - 1, SEEK_SET) == -1) {
+		*err = file_error(wth->random_fh);
+		return -1;
+	}
 
 	pkt_len = parse_toshiba_rec_hdr(NULL, wth->random_fh, pseudo_header,
-	    &err);
+	    err);
 
 	if (pkt_len != len) {
+		if (pkt_len != -1)
+			*err = WTAP_ERR_BAD_RECORD;
 		return -1;
 	}
 
-	parse_toshiba_hex_dump(wth->random_fh, pkt_len, pd, &err);
+	if (parse_toshiba_hex_dump(wth->random_fh, pkt_len, pd, err) == -1)
+		return -1;
 
 	return 0;
 }