File CVE-2018-5686.patch of Package mupdf

Overview Repositories Revisions Requests Users Attributes Meta

File CVE-2018-5686.patch of Package mupdf

X-Git-Url: http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=include%2Fmupdf%2Ffitz%2Fstream.h;h=790a0a83d3850facdceefb3c3e598fdb63d4e14d;hp=cd26be9039c064c8028fd6ca958044d133644e29;hb=b70eb93f6936c03d8af52040bbca4d4a7db39079;hpb=0d7359fbcd331ec0a22ec163dacff953f9817814

Index: mupdf-1.12.0-source/include/mupdf/fitz/stream.h
===================================================================
--- mupdf-1.12.0-source.orig/include/mupdf/fitz/stream.h
+++ mupdf-1.12.0-source/include/mupdf/fitz/stream.h
@@ -335,10 +335,11 @@ static inline size_t fz_available(fz_con
 
 	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_contex
 
 	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_contex
 
 	if (stm->rp != stm->wp)
 		return *stm->rp;
+	if (stm->eof)
+		return EOF;
 
 	c = stm->next(ctx, stm, 1);
 	if (c != EOF)

Places

File CVE-2018-5686.patch of Package mupdf

Places