diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-03-04 00:25:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-03-04 00:25:35 +0000 |
| commit | d54bd0bd6b3f8683031aae0cbf0107779ca40b58 (patch) | |
| tree | adc8f57b4cefa88b88ce35f476f4b456779cbd4b /wiretap/i4btrace.c | |
| parent | 7fef8be5ec6c35a80292f0d614f23dcb839a8397 (diff) | |
| download | wireshark-d54bd0bd6b3f8683031aae0cbf0107779ca40b58.tar.gz | |
Check for errors in seeks, "tell"s, and "stat()"s/"fstat()"s.
For file types where we allocate private data, add "close" routines
where they were missing, to free the private data. Also fix up the code
to clean up after some errors by freeing private data where that wasn't
being done.
Get rid of unused arguments to "wtap_dump_open_finish()".
Fix indentation.
svn path=/trunk/; revision=4857
Diffstat (limited to 'wiretap/i4btrace.c')
| -rw-r--r-- | wiretap/i4btrace.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index 7b4b88c380..0d5dec1c50 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -1,6 +1,6 @@ /* i4btrace.c * - * $Id: i4btrace.c,v 1.16 2002/02/08 10:07:40 guy Exp $ + * $Id: i4btrace.c,v 1.17 2002/03/04 00:25:35 guy Exp $ * * Wiretap Library * Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org> @@ -18,8 +18,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -40,6 +40,7 @@ static void i4b_byte_swap_header(wtap *wth, i4b_trace_hdr_t *hdr); static int i4b_read_rec_data(FILE_T fh, u_char *pd, int length, int *err); static void i4b_set_pseudo_header(wtap *wth, i4b_trace_hdr_t *hdr, union wtap_pseudo_header *pseudo_header); +static void i4btrace_close(wtap *wth); /* * Test some fields in the header to see if they make sense. @@ -89,7 +90,10 @@ int i4btrace_open(wtap *wth, int *err) byte_swapped = TRUE; } - file_seek(wth->fh, 0, SEEK_SET); + if (file_seek(wth->fh, 0, SEEK_SET) == -1) { + *err = file_error(wth->fh); + return -1; + } wth->data_offset = 0; /* Get capture start time */ @@ -98,6 +102,7 @@ int i4btrace_open(wtap *wth, int *err) wth->capture.i4btrace = g_malloc(sizeof(i4btrace_t)); wth->subtype_read = i4btrace_read; wth->subtype_seek_read = i4btrace_seek_read; + wth->subtype_close = i4btrace_close; wth->snapshot_length = 0; /* not known */ wth->capture.i4btrace->bchannel_prot[0] = -1; @@ -332,3 +337,9 @@ i4b_set_pseudo_header(wtap *wth, i4b_trace_hdr_t *hdr, break; } } + +static void +i4btrace_close(wtap *wth) +{ + g_free(wth->capture.i4btrace); +} |