|
 |
e2271c |
From 16d10a1c957425a49cf74332b99cf3d39e80cc09 Mon Sep 17 00:00:00 2001
|
|
|
e2271c |
From: Mark Harris <mark.hsj@gmail.com>
|
|
|
e2271c |
Date: Sun, 30 Aug 2015 05:54:46 -0700
|
|
|
e2271c |
Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
|
|
|
e2271c |
|
|
|
e2271c |
Fixes #2212
|
|
|
e2271c |
|
|
|
e2271c |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
e2271c |
---
|
|
|
e2271c |
oggenc/audio.c | 10 +++++-----
|
|
|
e2271c |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
e2271c |
|
|
|
e2271c |
diff --git a/oggenc/audio.c b/oggenc/audio.c
|
|
|
e2271c |
index 1cbb214..547e826 100644
|
|
|
e2271c |
--- a/oggenc/audio.c
|
|
|
e2271c |
+++ b/oggenc/audio.c
|
|
|
e2271c |
@@ -246,8 +246,8 @@ static int aiff_permute_matrix[6][6] =
|
|
|
e2271c |
int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
|
|
|
e2271c |
{
|
|
|
e2271c |
int aifc; /* AIFC or AIFF? */
|
|
|
e2271c |
- unsigned int len;
|
|
|
e2271c |
- unsigned char *buffer;
|
|
|
e2271c |
+ unsigned int len, readlen;
|
|
|
e2271c |
+ unsigned char buffer[22];
|
|
|
e2271c |
unsigned char buf2[8];
|
|
|
e2271c |
aiff_fmt format;
|
|
|
e2271c |
aifffile *aiff = malloc(sizeof(aifffile));
|
|
|
e2271c |
@@ -271,9 +271,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
|
|
|
e2271c |
return 0; /* Weird common chunk */
|
|
|
e2271c |
}
|
|
|
e2271c |
|
|
|
e2271c |
- buffer = alloca(len);
|
|
|
e2271c |
-
|
|
|
e2271c |
- if(fread(buffer,1,len,in) < len)
|
|
|
e2271c |
+ readlen = len < sizeof(buffer) ? len : sizeof(buffer);
|
|
|
e2271c |
+ if(fread(buffer,1,readlen,in) < readlen ||
|
|
|
e2271c |
+ (len > readlen && !seek_forward(in, len-readlen)))
|
|
|
e2271c |
{
|
|
|
e2271c |
fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
|
|
|
e2271c |
return 0;
|
|
|
e2271c |
--
|
|
|
e2271c |
2.4.6
|
|
|
e2271c |
|