1 files changed, 7 insertions, 4 deletions

diff --git a/include/mupdf/fitz/stream.h b/include/mupdf/fitz/stream.h
index cd26be903..790a0a83d 100644
--- a/include/mupdf/fitz/stream.h
+++ b/include/mupdf/fitz/stream.h
@@ -335,10 +335,11 @@ static inline size_t fz_available(fz_context *ctx, fz_stream *stm, size_t max)
 
         if (len)
                 return len;
+        if (stm->eof)
+                return 0;
+
         fz_try(ctx)
-        {
                 c = stm->next(ctx, stm, max);
-        }
         fz_catch(ctx)
         {
                 fz_rethrow_if(ctx, FZ_ERROR_TRYLATER);
@@ -369,10 +370,10 @@ static inline int fz_read_byte(fz_context *ctx, fz_stream *stm)
 
         if (stm->rp != stm->wp)
                 return *stm->rp++;
+        if (stm->eof)
+                return EOF;
         fz_try(ctx)
-        {
                 c = stm->next(ctx, stm, 1);
-        }
         fz_catch(ctx)
         {
                 fz_rethrow_if(ctx, FZ_ERROR_TRYLATER);
@@ -398,6 +399,8 @@ static inline int fz_peek_byte(fz_context *ctx, fz_stream *stm)
 
         if (stm->rp != stm->wp)
                 return *stm->rp;
+        if (stm->eof)
+                return EOF;
 
         fz_try(ctx)
         {