Upstream fix for CVE-2015-6749.
https://trac.xiph.org/ticket/2212

From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.hsj@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

dc8258b1a7d018258e3ef5919122'>commit</a><a href='/guix/diff/gnu/build/shepherd.scm?id=135c1e0e433edc8258b1a7d018258e3ef5919122'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/shepherd.scm'>
<input type='hidden' name='id' value='135c1e0e433edc8258b1a7d018258e3ef5919122'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=135c1e0e433edc8258b1a7d018258e3ef5919122'>root</a>/<a href='/guix/log/gnu?id=135c1e0e433edc8258b1a7d018258e3ef5919122'>gnu</a>/<a href='/guix/log/gnu/build?id=135c1e0e433edc8258b1a7d018258e3ef5919122'>build</a>/<a href='/guix/log/gnu/build/shepherd.scm?id=135c1e0e433edc8258b1a7d018258e3ef5919122'>shepherd.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/shepherd.scm?id=135c1e0e433edc8258b1a7d018258e3ef5919122&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-26 23:15:28 +0200'>2019-09-26</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=464caf72f9ff7600bd49e2df07e19cd9af28a930'>shepherd: Ensure the log file has correct ownership.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-26 23:15:28 +0200'>2019-09-26</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=0d3a4fc867100651af8b27cdf66b1bca1c8ba663'>shepherd: 'make-forkexec-constructor/container' keeps the log file.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-12 23:07:42 +0200'>2019-09-12</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=5ccec77176b7e0c67ed58c8849e5e76f3dd79a88'>file-systems: Add /var/run/nscd to '%network-file-mappings'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>