Date: Tuesday, October 27, 2015 @ 00:48:08 Author: eric Revision: 249776
archrelease: copy trunk to extra-i686, extra-x86_64 Added: vorbis-tools/repos/extra-i686/PKGBUILD (from rev 249775, vorbis-tools/trunk/PKGBUILD) vorbis-tools/repos/extra-i686/vorbis-tools-CVE-2015-6749.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-CVE-2015-6749.patch) vorbis-tools/repos/extra-i686/vorbis-tools-cve9638-cve9639.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9638-cve9639.patch) vorbis-tools/repos/extra-i686/vorbis-tools-cve9640.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9640.patch) vorbis-tools/repos/extra-x86_64/PKGBUILD (from rev 249775, vorbis-tools/trunk/PKGBUILD) vorbis-tools/repos/extra-x86_64/vorbis-tools-CVE-2015-6749.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-CVE-2015-6749.patch) vorbis-tools/repos/extra-x86_64/vorbis-tools-cve9638-cve9639.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9638-cve9639.patch) vorbis-tools/repos/extra-x86_64/vorbis-tools-cve9640.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9640.patch) Deleted: vorbis-tools/repos/extra-i686/PKGBUILD vorbis-tools/repos/extra-i686/vorbis-tools-cve9638-cve9639.patch vorbis-tools/repos/extra-i686/vorbis-tools-cve9640.patch vorbis-tools/repos/extra-x86_64/PKGBUILD vorbis-tools/repos/extra-x86_64/vorbis-tools-cve9638-cve9639.patch vorbis-tools/repos/extra-x86_64/vorbis-tools-cve9640.patch -------------------------------------------------+ /PKGBUILD | 72 ++++++++++ /vorbis-tools-cve9638-cve9639.patch | 154 ++++++++++++++++++++++ /vorbis-tools-cve9640.patch | 58 ++++++++ extra-i686/PKGBUILD | 33 ---- extra-i686/vorbis-tools-CVE-2015-6749.patch | 41 +++++ extra-i686/vorbis-tools-cve9638-cve9639.patch | 77 ----------- extra-i686/vorbis-tools-cve9640.patch | 29 ---- extra-x86_64/PKGBUILD | 33 ---- extra-x86_64/vorbis-tools-CVE-2015-6749.patch | 41 +++++ extra-x86_64/vorbis-tools-cve9638-cve9639.patch | 77 ----------- extra-x86_64/vorbis-tools-cve9640.patch | 29 ---- 11 files changed, 366 insertions(+), 278 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-10-26 23:42:35 UTC (rev 249775) +++ extra-i686/PKGBUILD 2015-10-26 23:48:08 UTC (rev 249776) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=vorbis-tools -pkgver=1.4.0 -pkgrel=5 -pkgdesc="Extra tools for Ogg-Vorbis" -arch=('i686' 'x86_64') -url='http://www.xiph.org/vorbis/' -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) -sha1sums=('fc6a820bdb5ad6fcac074721fab5c3f96eaf6562' - '307f4f5f20596e47fbed733bd2918c31549736a7' - 'ef99371b600740f5984b19ccb515f0cb1acb1af4') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/vorbis-tools-cve9638-cve9639.patch" - patch -p3 -i "${srcdir}/vorbis-tools-cve9640.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --without-speex --enable-vcut - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: vorbis-tools/repos/extra-i686/PKGBUILD (from rev 249775, vorbis-tools/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=vorbis-tools +pkgver=1.4.0 +pkgrel=6 +pkgdesc="Extra tools for Ogg-Vorbis" +arch=('i686' 'x86_64') +url='http://www.xiph.org/vorbis/' +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-CVE-2015-6749.patch) +sha1sums=('fc6a820bdb5ad6fcac074721fab5c3f96eaf6562' + '307f4f5f20596e47fbed733bd2918c31549736a7' + '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() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --without-speex --enable-vcut + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Copied: vorbis-tools/repos/extra-i686/vorbis-tools-CVE-2015-6749.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-CVE-2015-6749.patch) =================================================================== --- extra-i686/vorbis-tools-CVE-2015-6749.patch (rev 0) +++ extra-i686/vorbis-tools-CVE-2015-6749.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,41 @@ +From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 +From: Mark Harris <mark....@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 + Deleted: extra-i686/vorbis-tools-cve9638-cve9639.patch =================================================================== --- extra-i686/vorbis-tools-cve9638-cve9639.patch 2015-10-26 23:42:35 UTC (rev 249775) +++ extra-i686/vorbis-tools-cve9638-cve9639.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -1,77 +0,0 @@ -... in order to prevent a division by zero (CVE-2014-9638) and integer -overflow (CVE-2014-9639). - -Bug: https://trac.xiph.org/ticket/2136 -Bug: https://trac.xiph.org/ticket/2137 ---- - oggenc/audio.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..1167f1b 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -13,6 +13,7 @@ - #include <config.h> - #endif - -+#include <limits.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); - int i; -+ long channels; - - if(buf[11]=='C') - aifc=1; -@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; - } - -- format.channels = READ_U16_BE(buffer); -+ format.channels = channels = READ_U16_BE(buffer); - format.totalframes = READ_U32_BE(buffer+2); - format.samplesize = READ_U16_BE(buffer+6); - format.rate = (int)read_IEEE80(buffer+8); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); -+ return 0; -+ } -+ - aiff->bigendian = 1; - - if(aifc) -@@ -416,6 +424,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - wav_fmt format; - wavfile *wav = malloc(sizeof(wavfile)); - int i; -+ long channels; - - /* Ok. At this point, we know we have a WAV file. Now we have to detect - * whether we support the subtype, and we have to find the actual data -@@ -453,12 +462,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - } - - format.format = READ_U16_LE(buf); -- format.channels = READ_U16_LE(buf+2); -+ format.channels = channels = READ_U16_LE(buf+2); - format.samplerate = READ_U32_LE(buf+4); - format.bytespersec = READ_U32_LE(buf+8); - format.align = READ_U16_LE(buf+12); - format.samplesize = READ_U16_LE(buf+14); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); -+ return 0; -+ } -+ - if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ - { - if(len<40) --- Copied: vorbis-tools/repos/extra-i686/vorbis-tools-cve9638-cve9639.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9638-cve9639.patch) =================================================================== --- extra-i686/vorbis-tools-cve9638-cve9639.patch (rev 0) +++ extra-i686/vorbis-tools-cve9638-cve9639.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,77 @@ +... in order to prevent a division by zero (CVE-2014-9638) and integer +overflow (CVE-2014-9639). + +Bug: https://trac.xiph.org/ticket/2136 +Bug: https://trac.xiph.org/ticket/2137 +--- + oggenc/audio.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 477da8c..1167f1b 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -13,6 +13,7 @@ + #include <config.h> + #endif + ++#include <limits.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); + int i; ++ long channels; + + if(buf[11]=='C') + aifc=1; +@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; + } + +- format.channels = READ_U16_BE(buffer); ++ format.channels = channels = READ_U16_BE(buffer); + format.totalframes = READ_U32_BE(buffer+2); + format.samplesize = READ_U16_BE(buffer+6); + format.rate = (int)read_IEEE80(buffer+8); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); ++ return 0; ++ } ++ + aiff->bigendian = 1; + + if(aifc) +@@ -416,6 +424,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + wav_fmt format; + wavfile *wav = malloc(sizeof(wavfile)); + int i; ++ long channels; + + /* Ok. At this point, we know we have a WAV file. Now we have to detect + * whether we support the subtype, and we have to find the actual data +@@ -453,12 +462,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + } + + format.format = READ_U16_LE(buf); +- format.channels = READ_U16_LE(buf+2); ++ format.channels = channels = READ_U16_LE(buf+2); + format.samplerate = READ_U32_LE(buf+4); + format.bytespersec = READ_U32_LE(buf+8); + format.align = READ_U16_LE(buf+12); + format.samplesize = READ_U16_LE(buf+14); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); ++ return 0; ++ } ++ + if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ + { + if(len<40) +-- Deleted: extra-i686/vorbis-tools-cve9640.patch =================================================================== --- extra-i686/vorbis-tools-cve9640.patch 2015-10-26 23:42:35 UTC (rev 249775) +++ extra-i686/vorbis-tools-cve9640.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -1,29 +0,0 @@ -Index: /trunk/vorbis-tools/oggenc/oggenc.c -=================================================================== ---- /trunk/vorbis-tools/oggenc/oggenc.c (revision 19116) -+++ /trunk/vorbis-tools/oggenc/oggenc.c (revision 19117) -@@ -98,4 +98,6 @@ - 0,0,0.f, - 0, 0, 0, 0, 0}; -+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -+ N_("RAW file reader")}; - - int i; -@@ -240,6 +242,4 @@ - if(opt.rawmode) - { -- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -- N_("RAW file reader")}; - - enc_opts.rate=opt.raw_samplerate; -Index: /trunk/vorbis-tools/oggenc/skeleton.h -=================================================================== ---- /trunk/vorbis-tools/oggenc/skeleton.h (revision 19116) -+++ /trunk/vorbis-tools/oggenc/skeleton.h (revision 19117) -@@ -42,5 +42,5 @@ - ogg_int64_t start_granule; /* start granule value */ - ogg_uint32_t preroll; /* preroll */ -- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ -+ unsigned char granule_shift; /* 1 byte value holding the granule shift */ - char *message_header_fields; /* holds all the message header fields */ - /* current total size of the message header fields, for realloc purpose, initially zero */ Copied: vorbis-tools/repos/extra-i686/vorbis-tools-cve9640.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9640.patch) =================================================================== --- extra-i686/vorbis-tools-cve9640.patch (rev 0) +++ extra-i686/vorbis-tools-cve9640.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,29 @@ +Index: /trunk/vorbis-tools/oggenc/oggenc.c +=================================================================== +--- /trunk/vorbis-tools/oggenc/oggenc.c (revision 19116) ++++ /trunk/vorbis-tools/oggenc/oggenc.c (revision 19117) +@@ -98,4 +98,6 @@ + 0,0,0.f, + 0, 0, 0, 0, 0}; ++ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", ++ N_("RAW file reader")}; + + int i; +@@ -240,6 +242,4 @@ + if(opt.rawmode) + { +- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", +- N_("RAW file reader")}; + + enc_opts.rate=opt.raw_samplerate; +Index: /trunk/vorbis-tools/oggenc/skeleton.h +=================================================================== +--- /trunk/vorbis-tools/oggenc/skeleton.h (revision 19116) ++++ /trunk/vorbis-tools/oggenc/skeleton.h (revision 19117) +@@ -42,5 +42,5 @@ + ogg_int64_t start_granule; /* start granule value */ + ogg_uint32_t preroll; /* preroll */ +- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ ++ unsigned char granule_shift; /* 1 byte value holding the granule shift */ + char *message_header_fields; /* holds all the message header fields */ + /* current total size of the message header fields, for realloc purpose, initially zero */ Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-10-26 23:42:35 UTC (rev 249775) +++ extra-x86_64/PKGBUILD 2015-10-26 23:48:08 UTC (rev 249776) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=vorbis-tools -pkgver=1.4.0 -pkgrel=5 -pkgdesc="Extra tools for Ogg-Vorbis" -arch=('i686' 'x86_64') -url='http://www.xiph.org/vorbis/' -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) -sha1sums=('fc6a820bdb5ad6fcac074721fab5c3f96eaf6562' - '307f4f5f20596e47fbed733bd2918c31549736a7' - 'ef99371b600740f5984b19ccb515f0cb1acb1af4') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/vorbis-tools-cve9638-cve9639.patch" - patch -p3 -i "${srcdir}/vorbis-tools-cve9640.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --without-speex --enable-vcut - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: vorbis-tools/repos/extra-x86_64/PKGBUILD (from rev 249775, vorbis-tools/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=vorbis-tools +pkgver=1.4.0 +pkgrel=6 +pkgdesc="Extra tools for Ogg-Vorbis" +arch=('i686' 'x86_64') +url='http://www.xiph.org/vorbis/' +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-CVE-2015-6749.patch) +sha1sums=('fc6a820bdb5ad6fcac074721fab5c3f96eaf6562' + '307f4f5f20596e47fbed733bd2918c31549736a7' + '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() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --without-speex --enable-vcut + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Copied: vorbis-tools/repos/extra-x86_64/vorbis-tools-CVE-2015-6749.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-CVE-2015-6749.patch) =================================================================== --- extra-x86_64/vorbis-tools-CVE-2015-6749.patch (rev 0) +++ extra-x86_64/vorbis-tools-CVE-2015-6749.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,41 @@ +From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 +From: Mark Harris <mark....@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 + Deleted: extra-x86_64/vorbis-tools-cve9638-cve9639.patch =================================================================== --- extra-x86_64/vorbis-tools-cve9638-cve9639.patch 2015-10-26 23:42:35 UTC (rev 249775) +++ extra-x86_64/vorbis-tools-cve9638-cve9639.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -1,77 +0,0 @@ -... in order to prevent a division by zero (CVE-2014-9638) and integer -overflow (CVE-2014-9639). - -Bug: https://trac.xiph.org/ticket/2136 -Bug: https://trac.xiph.org/ticket/2137 ---- - oggenc/audio.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..1167f1b 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -13,6 +13,7 @@ - #include <config.h> - #endif - -+#include <limits.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); - int i; -+ long channels; - - if(buf[11]=='C') - aifc=1; -@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; - } - -- format.channels = READ_U16_BE(buffer); -+ format.channels = channels = READ_U16_BE(buffer); - format.totalframes = READ_U32_BE(buffer+2); - format.samplesize = READ_U16_BE(buffer+6); - format.rate = (int)read_IEEE80(buffer+8); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); -+ return 0; -+ } -+ - aiff->bigendian = 1; - - if(aifc) -@@ -416,6 +424,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - wav_fmt format; - wavfile *wav = malloc(sizeof(wavfile)); - int i; -+ long channels; - - /* Ok. At this point, we know we have a WAV file. Now we have to detect - * whether we support the subtype, and we have to find the actual data -@@ -453,12 +462,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) - } - - format.format = READ_U16_LE(buf); -- format.channels = READ_U16_LE(buf+2); -+ format.channels = channels = READ_U16_LE(buf+2); - format.samplerate = READ_U32_LE(buf+4); - format.bytespersec = READ_U32_LE(buf+8); - format.align = READ_U16_LE(buf+12); - format.samplesize = READ_U16_LE(buf+14); - -+ if(channels <= 0L || SHRT_MAX < channels) -+ { -+ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); -+ return 0; -+ } -+ - if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ - { - if(len<40) --- Copied: vorbis-tools/repos/extra-x86_64/vorbis-tools-cve9638-cve9639.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9638-cve9639.patch) =================================================================== --- extra-x86_64/vorbis-tools-cve9638-cve9639.patch (rev 0) +++ extra-x86_64/vorbis-tools-cve9638-cve9639.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,77 @@ +... in order to prevent a division by zero (CVE-2014-9638) and integer +overflow (CVE-2014-9639). + +Bug: https://trac.xiph.org/ticket/2136 +Bug: https://trac.xiph.org/ticket/2137 +--- + oggenc/audio.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 477da8c..1167f1b 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -13,6 +13,7 @@ + #include <config.h> + #endif + ++#include <limits.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); + int i; ++ long channels; + + if(buf[11]=='C') + aifc=1; +@@ -277,11 +279,17 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; + } + +- format.channels = READ_U16_BE(buffer); ++ format.channels = channels = READ_U16_BE(buffer); + format.totalframes = READ_U32_BE(buffer+2); + format.samplesize = READ_U16_BE(buffer+6); + format.rate = (int)read_IEEE80(buffer+8); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n")); ++ return 0; ++ } ++ + aiff->bigendian = 1; + + if(aifc) +@@ -416,6 +424,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + wav_fmt format; + wavfile *wav = malloc(sizeof(wavfile)); + int i; ++ long channels; + + /* Ok. At this point, we know we have a WAV file. Now we have to detect + * whether we support the subtype, and we have to find the actual data +@@ -453,12 +462,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen) + } + + format.format = READ_U16_LE(buf); +- format.channels = READ_U16_LE(buf+2); ++ format.channels = channels = READ_U16_LE(buf+2); + format.samplerate = READ_U32_LE(buf+4); + format.bytespersec = READ_U32_LE(buf+8); + format.align = READ_U16_LE(buf+12); + format.samplesize = READ_U16_LE(buf+14); + ++ if(channels <= 0L || SHRT_MAX < channels) ++ { ++ fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n")); ++ return 0; ++ } ++ + if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */ + { + if(len<40) +-- Deleted: extra-x86_64/vorbis-tools-cve9640.patch =================================================================== --- extra-x86_64/vorbis-tools-cve9640.patch 2015-10-26 23:42:35 UTC (rev 249775) +++ extra-x86_64/vorbis-tools-cve9640.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -1,29 +0,0 @@ -Index: /trunk/vorbis-tools/oggenc/oggenc.c -=================================================================== ---- /trunk/vorbis-tools/oggenc/oggenc.c (revision 19116) -+++ /trunk/vorbis-tools/oggenc/oggenc.c (revision 19117) -@@ -98,4 +98,6 @@ - 0,0,0.f, - 0, 0, 0, 0, 0}; -+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -+ N_("RAW file reader")}; - - int i; -@@ -240,6 +242,4 @@ - if(opt.rawmode) - { -- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", -- N_("RAW file reader")}; - - enc_opts.rate=opt.raw_samplerate; -Index: /trunk/vorbis-tools/oggenc/skeleton.h -=================================================================== ---- /trunk/vorbis-tools/oggenc/skeleton.h (revision 19116) -+++ /trunk/vorbis-tools/oggenc/skeleton.h (revision 19117) -@@ -42,5 +42,5 @@ - ogg_int64_t start_granule; /* start granule value */ - ogg_uint32_t preroll; /* preroll */ -- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ -+ unsigned char granule_shift; /* 1 byte value holding the granule shift */ - char *message_header_fields; /* holds all the message header fields */ - /* current total size of the message header fields, for realloc purpose, initially zero */ Copied: vorbis-tools/repos/extra-x86_64/vorbis-tools-cve9640.patch (from rev 249775, vorbis-tools/trunk/vorbis-tools-cve9640.patch) =================================================================== --- extra-x86_64/vorbis-tools-cve9640.patch (rev 0) +++ extra-x86_64/vorbis-tools-cve9640.patch 2015-10-26 23:48:08 UTC (rev 249776) @@ -0,0 +1,29 @@ +Index: /trunk/vorbis-tools/oggenc/oggenc.c +=================================================================== +--- /trunk/vorbis-tools/oggenc/oggenc.c (revision 19116) ++++ /trunk/vorbis-tools/oggenc/oggenc.c (revision 19117) +@@ -98,4 +98,6 @@ + 0,0,0.f, + 0, 0, 0, 0, 0}; ++ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", ++ N_("RAW file reader")}; + + int i; +@@ -240,6 +242,4 @@ + if(opt.rawmode) + { +- input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", +- N_("RAW file reader")}; + + enc_opts.rate=opt.raw_samplerate; +Index: /trunk/vorbis-tools/oggenc/skeleton.h +=================================================================== +--- /trunk/vorbis-tools/oggenc/skeleton.h (revision 19116) ++++ /trunk/vorbis-tools/oggenc/skeleton.h (revision 19117) +@@ -42,5 +42,5 @@ + ogg_int64_t start_granule; /* start granule value */ + ogg_uint32_t preroll; /* preroll */ +- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */ ++ unsigned char granule_shift; /* 1 byte value holding the granule shift */ + char *message_header_fields; /* holds all the message header fields */ + /* current total size of the message header fields, for realloc purpose, initially zero */