add patch from upstream to fix possible memory corruption due to

malformed JPEG images (SA43020)

1 files changed, 25 insertions, 0 deletions

diff --git a/print/mupdf/patches/patch-ad b/print/mupdf/patches/patch-ad
new file mode 100644
index 00000000000..3efb4c59d3a
--- /dev/null
+++ b/print/mupdf/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2011/01/31 17:44:31 drochner Exp $
+
+http://secunia.com/advisories/43020/
+
+--- fitz/filt_dctd.c.orig	2010-08-25 14:12:11.000000000 +0000
++++ fitz/filt_dctd.c
+@@ -182,8 +182,18 @@ static void
+ closedctd(fz_stream *stm)
+ {
+ 	fz_dctd *state = stm->state;
++
++	if (setjmp(state->jb))
++	{
++		state->chain->rp = state->chain->wp - state->cinfo.src->bytes_in_buffer;
++		fz_warn("jpeg error: %s", state->msg);
++		goto skip;
++	}
++
+ 	if (state->init)
+ 		jpeg_finish_decompress(&state->cinfo);
++
++skip:
+ 	state->chain->rp = state->chain->wp - state->cinfo.src->bytes_in_buffer;
+ 	jpeg_destroy_decompress(&state->cinfo);
+ 	fz_free(state->scanline);