Attachment 174138 Details for Bug 212207 – mupdf.diff

[patch] mupdf.diff

mupdf.diff (text/plain), 5.02 KB, created by Tobias Kortkamp on 2016-08-27 22:44:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-08-27 22:44:58 UTC

Size: 5.02 KB

patch

obsolete

>Index: llpp/Makefile
>===================================================================
>--- llpp/Makefile	(revision 420907)
>+++ llpp/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	llpp
> PORTVERSION=	22
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> MASTER_SITES=	http://repo.or.cz/llpp.git/snapshot/
> DISTNAME=	561dc5673cea431e930668b0d87b0c4b31a36b39
>Index: mupdf/Makefile
>===================================================================
>--- mupdf/Makefile	(revision 420907)
>+++ mupdf/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mupdf
> PORTVERSION=	1.9a
>+PORTREVISION=	1
> DISTVERSIONSUFFIX=	-source
> PORTEPOCH=	1
> CATEGORIES=	graphics
>Index: mupdf/files/patch-scripts_fontdump.c
>===================================================================
>--- mupdf/files/patch-scripts_fontdump.c	(revision 420907)
>+++ mupdf/files/patch-scripts_fontdump.c	(working copy)
>@@ -1,4 +1,4 @@
>---- scripts/fontdump.c.orig	2016-06-12 09:11:56 UTC
>+--- scripts/fontdump.c.orig	2016-04-21 11:14:32 UTC
> +++ scripts/fontdump.c
> @@ -50,7 +50,6 @@ main(int argc, char **argv)
>  	fprintf(fo, "#ifndef __STRICT_ANSI__\n");
>Index: mupdf/files/patch-source__fitz__load-jpx.c
>===================================================================
>--- mupdf/files/patch-source__fitz__load-jpx.c	(revision 420907)
>+++ mupdf/files/patch-source__fitz__load-jpx.c	(working copy)
>@@ -1,4 +1,4 @@
>---- source/fitz/load-jpx.c.orig	2015-04-16 08:57:45 UTC
>+--- source/fitz/load-jpx.c.orig	2016-04-21 11:14:32 UTC
> +++ source/fitz/load-jpx.c
> @@ -1,14 +1,6 @@
>  #include "mupdf/fitz.h"
>Index: mupdf/files/patch-source_pdf_pdf-shade.c
>===================================================================
>--- mupdf/files/patch-source_pdf_pdf-shade.c	(nonexistent)
>+++ mupdf/files/patch-source_pdf_pdf-shade.c	(working copy)
>@@ -0,0 +1,17 @@
>+$OpenBSD: patch-source_pdf_pdf-shade_c,v 1.1 2016/08/27 20:58:48 jca Exp $
>+
>+  CVE-2016-6525
>+
>+  http://git.ghostscript.com/?p=mupdf.git;a=commitdiff;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958
>+
>+--- source/pdf/pdf-shade.c.orig	2016-04-21 11:14:32 UTC
>++++ source/pdf/pdf-shade.c
>+@@ -206,7 +206,7 @@ pdf_load_mesh_params(fz_context *ctx, pd
>+ 	obj = pdf_dict_get(ctx, dict, PDF_NAME_Decode);
>+ 	if (pdf_array_len(ctx, obj) >= 6)
>+ 	{
>+-		n = (pdf_array_len(ctx, obj) - 4) / 2;
>++		n = fz_mini(FZ_MAX_COLORS, (pdf_array_len(ctx, obj) - 4) / 2);
>+ 		shade->u.m.x0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 0));
>+ 		shade->u.m.x1 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 1));
>+ 		shade->u.m.y0 = pdf_to_real(ctx, pdf_array_get(ctx, obj, 2));
>
>Property changes on: mupdf/files/patch-source_pdf_pdf-shade.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: mupdf/files/patch-source_pdf_pdf-xref.c
>===================================================================
>--- mupdf/files/patch-source_pdf_pdf-xref.c	(nonexistent)
>+++ mupdf/files/patch-source_pdf_pdf-xref.c	(working copy)
>@@ -0,0 +1,25 @@
>+$OpenBSD: patch-source_pdf_pdf-xref_c,v 1.1 2016/08/27 20:58:48 jca Exp $
>+
>+  CVE-2016-6265
>+
>+  http://git.ghostscript.com/?p=mupdf.git;a=commitdiff;h=fa1936405b6a84e5c9bb440912c23d532772f958
>+
>+--- source/pdf/pdf-xref.c.orig	2016-04-21 11:14:32 UTC
>++++ source/pdf/pdf-xref.c
>+@@ -1191,8 +1191,14 @@ pdf_load_xref(fz_context *ctx, pdf_docum
>+ 				fz_throw(ctx, FZ_ERROR_GENERIC, "object offset out of range: %d (%d 0 R)", (int)entry->ofs, i);
>+ 		}
>+ 		if (entry->type == 'o')
>+-			if (entry->ofs <= 0 || entry->ofs >= xref_len || pdf_get_xref_entry(ctx, doc, entry->ofs)->type != 'n')
>+-				fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)entry->ofs, i);
>++		{
>++			/* Read this into a local variable here, because pdf_get_xref_entry
>++			 * may solidify the xref, hence invalidating "entry", meaning we
>++			 * need a stashed value for the throw. */
>++			fz_off_t ofs = entry->ofs;
>++			if (ofs <= 0 || ofs >= xref_len || pdf_get_xref_entry(ctx, doc, ofs)->type != 'n')
>++				fz_throw(ctx, FZ_ERROR_GENERIC, "invalid reference to an objstm that does not exist: %d (%d 0 R)", (int)ofs, i);
>++		}
>+ 	}
>+ }
>+ 
>
>Property changes on: mupdf/files/patch-source_pdf_pdf-xref.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: zathura-pdf-mupdf/Makefile
>===================================================================
>--- zathura-pdf-mupdf/Makefile	(revision 420907)
>+++ zathura-pdf-mupdf/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zathura-pdf-mupdf
> PORTVERSION=	0.3.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> MASTER_SITES=	http://pwmt.org/projects/zathura-pdf-mupdf/download/
>

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 212207: 174138