[arch-commits] Commit in vorbis-tools/trunk (2 files)

Eric Bélanger eric at archlinux.org
Mon Oct 26 23:42:35 UTC 2015


    Date: Tuesday, October 27, 2015 @ 00:42:35
  Author: eric
Revision: 249775

upgpkg: vorbis-tools 1.4.0-6

Add security patch CVE-2015-6749 (close FS#46269)

Added:
  vorbis-tools/trunk/vorbis-tools-CVE-2015-6749.patch
Modified:
  vorbis-tools/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |    9 +++++---
 vorbis-tools-CVE-2015-6749.patch |   41 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-26 21:27:44 UTC (rev 249774)
+++ PKGBUILD	2015-10-26 23:42:35 UTC (rev 249775)
@@ -3,7 +3,7 @@
 
 pkgname=vorbis-tools
 pkgver=1.4.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Extra tools for Ogg-Vorbis"
 arch=('i686' 'x86_64')
 url='http://www.xiph.org/vorbis/'
@@ -10,15 +10,18 @@
 license=('GPL2')
 depends=('libao' 'libvorbis' 'curl' 'flac')
 source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz
-	vorbis-tools-cve9638-cve9639.patch vorbis-tools-cve9640.patch)
+	vorbis-tools-cve9638-cve9639.patch vorbis-tools-cve9640.patch
+	vorbis-tools-CVE-2015-6749.patch)
 sha1sums=('fc6a820bdb5ad6fcac074721fab5c3f96eaf6562'
           '307f4f5f20596e47fbed733bd2918c31549736a7'
-          'ef99371b600740f5984b19ccb515f0cb1acb1af4')
+          'ef99371b600740f5984b19ccb515f0cb1acb1af4'
+          '1c9b794394f0dd2bec289c2d11f58cf100d5c572')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/vorbis-tools-cve9638-cve9639.patch"
   patch -p3 -i "${srcdir}/vorbis-tools-cve9640.patch"
+  patch -p1 -i "${srcdir}/vorbis-tools-CVE-2015-6749.patch"
 }
 
 build() {

Added: vorbis-tools-CVE-2015-6749.patch
===================================================================
--- vorbis-tools-CVE-2015-6749.patch	                        (rev 0)
+++ vorbis-tools-CVE-2015-6749.patch	2015-10-26 23:42:35 UTC (rev 249775)
@@ -0,0 +1,41 @@
+From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
+From: Mark Harris <mark.hsj at gmail.com>
+Date: Sun, 30 Aug 2015 05:54:46 -0700
+Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
+
+Fixes #2212
+---
+ oggenc/audio.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/oggenc/audio.c b/oggenc/audio.c
+index 477da8c..4921fb9 100644
+--- a/oggenc/audio.c
++++ b/oggenc/audio.c
+@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
+ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+ {
+     int aifc; /* AIFC or AIFF? */
+-    unsigned int len;
+-    unsigned char *buffer;
++    unsigned int len, readlen;
++    unsigned char buffer[22];
+     unsigned char buf2[8];
+     aiff_fmt format;
+     aifffile *aiff = malloc(sizeof(aifffile));
+@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+         return 0; /* Weird common chunk */
+     }
+ 
+-    buffer = alloca(len);
+-
+-    if(fread(buffer,1,len,in) < len)
++    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
++    if(fread(buffer,1,readlen,in) < readlen ||
++       (len > readlen && !seek_forward(in, len-readlen)))
+     {
+         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
+         return 0;
+-- 
+2.5.0
+



More information about the arch-commits mailing list