diff options
| author | snj <snj@pkgsrc.org> | 2018-08-06 13:25:38 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2018-08-06 13:25:38 +0000 |
| commit | 2970dfd34493fbd853cf92a39c4b684ac4cab782 (patch) | |
| tree | b3bee5e022eac033f453319a6ada8faef07d2bc8 /audio/libvorbis | |
| parent | 9b3a9c869c5372fb846b65b2250f9572585bfc58 (diff) | |
| download | pkgsrc-2970dfd34493fbd853cf92a39c4b684ac4cab782.tar.gz | |
audio/libvorbis: Fix CVE-2017-14160, CVE-2018-10392, and CVE-2018-10393.
Bump PKGREVISION to 1.
Diffstat (limited to 'audio/libvorbis')
| -rw-r--r-- | audio/libvorbis/Makefile | 3 | ||||
| -rw-r--r-- | audio/libvorbis/distinfo | 4 | ||||
| -rw-r--r-- | audio/libvorbis/patches/patch-lib_psy.c | 19 | ||||
| -rw-r--r-- | audio/libvorbis/patches/patch-lib_vorbisenc.c | 14 |
4 files changed, 38 insertions, 2 deletions
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index f0bf4f7f906..71a8c98bce3 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2018/03/16 20:37:10 maya Exp $ +# $NetBSD: Makefile,v 1.62 2018/08/06 13:25:38 snj Exp $ DISTNAME= libvorbis-1.3.6 +PKGREVISION= 1 CATEGORIES= devel audio MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ EXTRACT_SUFX= .tar.xz diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo index 995b1ad0e3a..3e0147bdd49 100644 --- a/audio/libvorbis/distinfo +++ b/audio/libvorbis/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.26 2018/03/16 20:23:53 maya Exp $ +$NetBSD: distinfo,v 1.27 2018/08/06 13:25:38 snj Exp $ SHA1 (libvorbis-1.3.6.tar.xz) = 237e3d1c66452734fd9b32f494f44238b4f0185e RMD160 (libvorbis-1.3.6.tar.xz) = 80213c5a1506438a342588ae58097a1590b6657c SHA512 (libvorbis-1.3.6.tar.xz) = a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132 Size (libvorbis-1.3.6.tar.xz) = 1195388 bytes +SHA1 (patch-lib_psy.c) = acbc6fd4e4e7710a05b6342c10270f085214a84f +SHA1 (patch-lib_vorbisenc.c) = e65377b441c71e75e86064292dccfb86acf298b2 diff --git a/audio/libvorbis/patches/patch-lib_psy.c b/audio/libvorbis/patches/patch-lib_psy.c new file mode 100644 index 00000000000..5760983e056 --- /dev/null +++ b/audio/libvorbis/patches/patch-lib_psy.c @@ -0,0 +1,19 @@ +$NetBSD: patch-lib_psy.c,v 1.1 2018/08/06 13:25:38 snj Exp $ + +CVE-2017-14160: fix bounds check on very low sample rates. + +https://github.com/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25#diff-3b415297c1f1559ee10baa1284561e46 + +--- lib/psy.c.orig 2018-08-06 06:10:59.234730587 -0700 ++++ lib/psy.c 2018-08-06 06:13:28.935699414 -0700 +@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,co + for (i = 0, x = 0.f;; i++, x += 1.f) { + + lo = b[i] >> 16; +- if( lo>=0 ) break; + hi = b[i] & 0xffff; ++ if( lo>=0 ) break; ++ if( hi>=n ) break; + + tN = N[hi] + N[-lo]; + tX = X[hi] - X[-lo]; diff --git a/audio/libvorbis/patches/patch-lib_vorbisenc.c b/audio/libvorbis/patches/patch-lib_vorbisenc.c new file mode 100644 index 00000000000..25d367f5d74 --- /dev/null +++ b/audio/libvorbis/patches/patch-lib_vorbisenc.c @@ -0,0 +1,14 @@ +$NetBSD: patch-lib_vorbisenc.c,v 1.1 2018/08/06 13:25:38 snj Exp $ + +https://gitlab.xiph.org/xiph/vorbis/issues/2335 + +--- lib/vorbisenc.c.orig 2018-08-06 06:17:42.209959046 -0700 ++++ lib/vorbisenc.c 2018-08-06 06:18:01.425700460 -0700 +@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info + highlevel_encode_setup *hi=&ci->hi; + + if(ci==NULL)return(OV_EINVAL); ++ if(vi->channels<1||vi->channels>255)return(OV_EINVAL); + if(!hi->impulse_block_p)i0=1; + + /* too low/high an ATH floater is nonsensical, but doesn't break anything */ |