Make sure we call wtap_cleareof() before each read.

svn path=/trunk/; revision=33555

1 files changed, 5 insertions, 2 deletions

diff --git a/file.c b/file.c
index 1c5519f379..c3ca81dcc2 100644
--- a/file.c
+++ b/file.c
@@ -800,8 +800,11 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err)
 
   /*g_log(NULL, G_LOG_LEVEL_MESSAGE, "cf_continue_tail: %u new: %u", cf->count, to_read);*/
 
-  wtap_cleareof(cf->wth);
-  while (to_read != 0 && (wtap_read(cf->wth, err, &err_info, &data_offset))) {
+  while (to_read != 0) {
+    wtap_cleareof(cf->wth);
+    if (!wtap_read(cf->wth, err, &err_info, &data_offset)) {
+      break;
+    }
     if (cf->state == FILE_READ_ABORTED) {
       /* Well, the user decided to exit Wireshark.  Break out of the
          loop, and let the code below (which is called even if there