From 2ca5312b6476d37ad709ca5eb688952004371fd5 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 10 May 2011 20:17:31 +0000 Subject: file_read() can return -1; don't just blindly add it to a previous file_read() return value. Use wtap_file_read_expected_bytes() in a number of places. svn path=/trunk/; revision=37053 --- wiretap/commview.c | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) (limited to 'wiretap/commview.c') diff --git a/wiretap/commview.c b/wiretap/commview.c index 30fe21b768..2cd74a520a 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -243,26 +243,24 @@ static gboolean commview_read_header(commview_header_t *cv_hdr, FILE_T fh, int *err, gchar **err_info) { - int bytes_read = 0; - - bytes_read += file_read(&cv_hdr->data_len, 2, fh); - bytes_read += file_read(&cv_hdr->source_data_len, 2, fh); - bytes_read += file_read(&cv_hdr->version, 1, fh); - bytes_read += file_read(&cv_hdr->year, 2, fh); - bytes_read += file_read(&cv_hdr->month, 1, fh); - bytes_read += file_read(&cv_hdr->day, 1, fh); - bytes_read += file_read(&cv_hdr->hours, 1, fh); - bytes_read += file_read(&cv_hdr->minutes, 1, fh); - bytes_read += file_read(&cv_hdr->seconds, 1, fh); - bytes_read += file_read(&cv_hdr->usecs, 4, fh); - bytes_read += file_read(&cv_hdr->flags, 1, fh); - bytes_read += file_read(&cv_hdr->signal_level_percent, 1, fh); - bytes_read += file_read(&cv_hdr->rate, 1, fh); - bytes_read += file_read(&cv_hdr->band, 1, fh); - bytes_read += file_read(&cv_hdr->channel, 1, fh); - bytes_read += file_read(&cv_hdr->direction, 1, fh); - bytes_read += file_read(&cv_hdr->signal_level_dbm, 1, fh); - bytes_read += file_read(&cv_hdr->noise_level, 1, fh); + wtap_file_read_expected_bytes(&cv_hdr->data_len, 2, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->source_data_len, 2, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->version, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->year, 2, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->month, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->day, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->hours, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->minutes, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->seconds, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->usecs, 4, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->flags, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->signal_level_percent, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->rate, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->band, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->channel, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->direction, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->signal_level_dbm, 1, fh, err, err_info); + wtap_file_read_expected_bytes(&cv_hdr->noise_level, 1, fh, err, err_info); /* Convert multi-byte values from little endian to host endian format */ cv_hdr->data_len = GUINT16_FROM_LE(cv_hdr->data_len); @@ -270,14 +268,6 @@ commview_read_header(commview_header_t *cv_hdr, FILE_T fh, int *err, cv_hdr->year = GUINT16_FROM_LE(cv_hdr->year); cv_hdr->usecs = GUINT32_FROM_LE(cv_hdr->usecs); - if(bytes_read < COMMVIEW_HEADER_SIZE) { - *err = file_error(fh, err_info); - if(*err == 0 && bytes_read > 0) - *err = WTAP_ERR_SHORT_READ; - - return FALSE; - } - return TRUE; } -- cgit v1.2.1