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

mmit/doc/htmlxref.cnf?id=f7d4399618104c8da845311829033122dee53027'>commit</a><a href='/guix/diff/doc/htmlxref.cnf?id=f7d4399618104c8da845311829033122dee53027'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/htmlxref.cnf'>
<input type='hidden' name='id' value='f7d4399618104c8da845311829033122dee53027'/><input type='hidden' name='showmsg' value='1'/><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=f7d4399618104c8da845311829033122dee53027&amp;showmsg=1'>root</a>/<a href='/guix/log/doc?id=f7d4399618104c8da845311829033122dee53027&amp;showmsg=1'>doc</a>/<a href='/guix/log/doc/htmlxref.cnf?id=f7d4399618104c8da845311829033122dee53027&amp;showmsg=1'>htmlxref.cnf</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/doc/htmlxref.cnf?id=f7d4399618104c8da845311829033122dee53027'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2024-06-03 00:27:12 +0200'>2024-06-03</span></td><td class='logsubject'><a href='/guix/commit/doc/htmlxref.cnf?id=834a4195241806784d4b321b95f06d85f458ce18'>nls: Update translations.</a></td><td>Florian Pelz</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* po/doc/guix-cookbook.sv.po: New file.
* po/doc/local.mk: Add 'sv' cookbook.
* po/doc/po4a.cfg (po4a_langs): Add 'sv'.
* doc/local.mk: Add 'sv' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'sv'.
* doc/guix-cookbook.texi (Top): Mention 'sv' cookbook.

Change-Id: Ibfeb7254f583f1c8827e8c2756bbb02880bcba46


</td></tr>
<tr class='logheader'><td><span title='2024-04-01 14:09:20 +0200'>2024-04-01</span></td><td class='logsubject'><a href='/guix/commit/doc/htmlxref.cnf?id=fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5'>nls: Update translations.</a></td><td>Florian Pelz</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* po/guix/ar.po: New file.
* po/guix/LINGUAS: Add 'ar'.
* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add 'pt_BR' cookbook.
* doc/local.mk: Add 'pt_BR' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'ko', 'pt_BR'.
* doc/guix-cookbook.texi (Top): Mention 'ko', 'pt_BR' cookbook.

Change-Id: Id1846ca100263b3fc1fa2ed52654c670270ee809


</td></tr>
<tr class='logheader'><td><span title='2022-12-18 16:01:32 +0100'>2022-12-18</span></td><td class='logsubject'><a href='/guix/commit/doc/htmlxref.cnf?id=8e2f32cee982d42a79e53fc1e9aa7b8ff0514714'>doc: Update URLs for the manual and cookbook translations.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* doc/htmlxref.cnf: Update URLs for "guix" and "guix-cookbook".


</td></tr>
<tr class='logheader'><td><span title='2022-12-18 15:53:43 +0100'>2022-12-18</span></td><td class='logsubject'><a href='/guix/commit/doc/htmlxref.cnf?id=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87'>doc: Add guile-netlink to 'htmlxref.cnf'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* doc/htmlxref.cnf: Add guile-netlink.


</td></tr>