From 49fc082db3a628283f8d470dd0fcd1a06b919e6d Mon Sep 17 00:00:00 2001 From: "mcmullen%netscape.com" Date: Thu, 8 Apr 1999 17:31:00 +0000 Subject: [PATCH] Bug #4619. When at eof, get() was returning undefined character. Now returning 0. git-svn-id: svn://10.0.0.236/trunk@26814 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/src/nsFileStream.cpp | 5 +++-- mozilla/xpcom/io/nsFileStream.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/base/src/nsFileStream.cpp b/mozilla/base/src/nsFileStream.cpp index 418647bbcc2..ee19536a3a6 100644 --- a/mozilla/base/src/nsFileStream.cpp +++ b/mozilla/base/src/nsFileStream.cpp @@ -43,8 +43,9 @@ char nsInputStream::get() //---------------------------------------------------------------------------------------- { char c; - read(&c, sizeof(c)); - return c; + if (read(&c, sizeof(c)) == sizeof(c)) + return c; + return 0; } //---------------------------------------------------------------------------------------- diff --git a/mozilla/xpcom/io/nsFileStream.cpp b/mozilla/xpcom/io/nsFileStream.cpp index 418647bbcc2..ee19536a3a6 100644 --- a/mozilla/xpcom/io/nsFileStream.cpp +++ b/mozilla/xpcom/io/nsFileStream.cpp @@ -43,8 +43,9 @@ char nsInputStream::get() //---------------------------------------------------------------------------------------- { char c; - read(&c, sizeof(c)); - return c; + if (read(&c, sizeof(c)) == sizeof(c)) + return c; + return 0; } //----------------------------------------------------------------------------------------