diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-04 15:00:55 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-02-04 23:01:32 +0000 |
| commit | a44eece9aaea9a4e6a854d7897fc0c4cebf65084 (patch) | |
| tree | dfdb6a8251db58c6986658ddae341415caccc5a1 /wiretap/pcapng.c | |
| parent | 7b169cdedd93d5bc072e6582dde6430457ece505 (diff) | |
Check for read errors by checking for PCAPNG_BLOCK_ERROR.
Check for "is an error" rather than "isn't OK".
Change-Id: Ib8f4ac44f70d71ff44658801e01807344032dd60
Reviewed-on: https://code.wireshark.org/review/25603
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 5d8b0bb0cc..2c2a1a77e5 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -2349,7 +2349,7 @@ pcapng_read_block(wtap *wth, FILE_T fh, pcapng_t *pn, wtapng_block_t *wblock, in pcapng_debug("pcapng_read_block: block_type 0x%x", bh.block_type); ret = pcapng_read_section_header_block(fh, &bh, pn, wblock, err, err_info); - if (ret != PCAPNG_BLOCK_OK) { + if (ret == PCAPNG_BLOCK_ERROR) { return ret; } } else { @@ -2569,7 +2569,7 @@ pcapng_open(wtap *wth, int *err, gchar **err_info) if (bh.block_type != BLOCK_TYPE_IDB) { break; /* No more IDB:s */ } - if (pcapng_read_block(wth, wth->fh, &pn, &wblock, err, err_info) != PCAPNG_BLOCK_OK) { + if (pcapng_read_block(wth, wth->fh, &pn, &wblock, err, err_info) == PCAPNG_BLOCK_ERROR) { wtap_block_free(wblock.block); if (*err == 0) { pcapng_debug("No more IDBs available..."); @@ -2609,7 +2609,7 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) while (1) { *data_offset = file_tell(wth->fh); pcapng_debug("pcapng_read: data_offset is %" G_GINT64_MODIFIER "d", *data_offset); - if (pcapng_read_block(wth, wth->fh, pcapng, &wblock, err, err_info) != PCAPNG_BLOCK_OK) { + if (pcapng_read_block(wth, wth->fh, pcapng, &wblock, err, err_info) == PCAPNG_BLOCK_ERROR) { pcapng_debug("pcapng_read: data_offset is finally %" G_GINT64_MODIFIER "d", *data_offset); pcapng_debug("pcapng_read: couldn't read packet block"); wtap_block_free(wblock.block); @@ -2734,7 +2734,7 @@ pcapng_seek_read(wtap *wth, gint64 seek_off, /* read the block */ ret = pcapng_read_block(wth, wth->random_fh, pcapng, &wblock, err, err_info); wtap_block_free(wblock.block); - if (ret != PCAPNG_BLOCK_OK) { + if (ret == PCAPNG_BLOCK_ERROR) { pcapng_debug("pcapng_seek_read: couldn't read packet block (err=%d).", *err); return FALSE; |