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;
 }
 
 //----------------------------------------------------------------------------------------