From 268de5a50df7f4880d69ecebac640c8872a42109 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 10 Aug 1998 21:08:21 +0000
Subject: [PATCH] Handle EOF better for file streams

git-svn-id: svn://10.0.0.236/trunk@7679 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/htmlparser/src/nsScanner.cpp        | 3 +++
 mozilla/parser/htmlparser/src/nsScanner.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp
index 9e55085071e..20a5dfa454c 100644
--- a/mozilla/htmlparser/src/nsScanner.cpp
+++ b/mozilla/htmlparser/src/nsScanner.cpp
@@ -206,6 +206,9 @@ nsresult CScanner::FillBuffer(void) {
     if(mFileStream) {
       mFileStream->read(buf,kBufsize);
       numread=mFileStream->gcount();
+      if (0 == numread) {
+        return kEOF;
+      }
     }
     mOffset=mBuffer.Length();
     if((0<numread) && (0==anError))
diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp
index 9e55085071e..20a5dfa454c 100644
--- a/mozilla/parser/htmlparser/src/nsScanner.cpp
+++ b/mozilla/parser/htmlparser/src/nsScanner.cpp
@@ -206,6 +206,9 @@ nsresult CScanner::FillBuffer(void) {
     if(mFileStream) {
       mFileStream->read(buf,kBufsize);
       numread=mFileStream->gcount();
+      if (0 == numread) {
+        return kEOF;
+      }
     }
     mOffset=mBuffer.Length();
     if((0<numread) && (0==anError))