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))