head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.90
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.88
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.86
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.84
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.82
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.80
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.78
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.76
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.74
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.72
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.70
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.68
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.66
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.64
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.62
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.60
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.58
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.56
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.54
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.52
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.50
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.48
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.46
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.42
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.22
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.44
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.40
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.38
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.36
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.34
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.32
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.30
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.28
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.26
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.24
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.20
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.18
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.16
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.14
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.12
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.10
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.8
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.6
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.4
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.2
	pkgsrc-2015Q1-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2015.03.11.20.58.26;	author spz;	state Exp;
branches;
next	;
commitid	Tnte3jIneRYzqedy;


desc
@@


1.1
log
@add patches against CVE-2014-8137 CVE-2014-8138 CVE-2014-8157 and
CVE-2014-8158 originating from the Fedora project
@
text
@$NetBSD$

patch for CVE-2014-8158 loosely based on
http://pkgs.fedoraproject.org/cgit/jasper.git/plain/jasper-CVE-2014-8158.patch

eradicate all code-paths activated by HAVE_VLA

--- jasper/src/libjasper/jpc/jpc_qmfb.c.orig	2012-08-08 08:01:36.000000000 +0000
+++ jasper/src/libjasper/jpc/jpc_qmfb.c
@@@@ -158,12 +158,8 @@@@ static void jpc_qmfb1d_split(jpc_fix_t *
   jpc_fix_t *hstartptr, int hstartind, int hendind)
 {
 	int bufsize = JPC_CEILDIVPOW2(endind - startind, 2);
-#if !defined(HAVE_VLA)
 #define QMFB_SPLITBUFSIZE 4096
 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
-#else
-	jpc_fix_t splitbuf[bufsize];
-#endif
 	jpc_fix_t *buf = splitbuf;
 	int llen;
 	int hlen;
@@@@ -179,7 +175,6 @@@@ static void jpc_qmfb1d_split(jpc_fix_t *
 	llen = lendind - lstartind;
 	hlen = hendind - hstartind;
 
-#if !defined(HAVE_VLA)
 	/* Get a buffer. */
 	if (bufsize > QMFB_SPLITBUFSIZE) {
 		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@@@ -190,7 +185,6 @@@@ static void jpc_qmfb1d_split(jpc_fix_t *
 			return;
 		}
 	}
-#endif
 
 	if (hstartind < lstartind) {
 		/* The first sample in the input signal is to appear
@@@@ -272,12 +266,10 @@@@ static void jpc_qmfb1d_split(jpc_fix_t *
 		}
 	}
 
-#if !defined(HAVE_VLA)
 	/* If the split buffer was allocated on the heap, free this memory. */
 	if (buf != splitbuf) {
 		jas_free(buf);
 	}
-#endif
 }
 
 static void jpc_qmfb1d_join(jpc_fix_t *startptr, int startind, int endind,
@@@@ -285,12 +277,8 @@@@ static void jpc_qmfb1d_join(jpc_fix_t *s
   jpc_fix_t *hstartptr, int hstartind, int hendind)
 {
 	int bufsize = JPC_CEILDIVPOW2(endind - startind, 2);
-#if !defined(HAVE_VLA)
 #define	QMFB_JOINBUFSIZE	4096
 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
-#else
-	jpc_fix_t joinbuf[bufsize];
-#endif
 	jpc_fix_t *buf = joinbuf;
 	int llen;
 	int hlen;
@@@@ -302,7 +290,6 @@@@ static void jpc_qmfb1d_join(jpc_fix_t *s
 	register int n;
 	int state;
 
-#if !defined(HAVE_VLA)
 	/* Allocate memory for the join buffer from the heap. */
 	if (bufsize > QMFB_JOINBUFSIZE) {
 		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@@@ -313,7 +300,6 @@@@ static void jpc_qmfb1d_join(jpc_fix_t *s
 			return;
 		}
 	}
-#endif
 
 	twostep = step << 1;
 	llen = lendind - lstartind;
@@@@ -400,12 +386,10 @@@@ static void jpc_qmfb1d_join(jpc_fix_t *s
 		}
 	}
 
-#if !defined(HAVE_VLA)
 	/* If the join buffer was allocated on the heap, free this memory. */
 	if (buf != joinbuf) {
 		jas_free(buf);
 	}
-#endif
 }
 
 /******************************************************************************\
@