From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Tue, 2 Sep 2014 22:22:41 +0000 (+0200)
Subject: vorbisenc: avoid large stack allocation.
X-Git-Tag: android-x86-6.0-r1~3265
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=235d401bfa407806a468379611bd7ed23e5cd0df;p=android-x86%2Fexternal-ffmpeg.git

vorbisenc: avoid large stack allocation.

Code is only used during initialization, so malloc/free
should be fine to use.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
---

diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 0fb7190779..0f78d95ffd 100644
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -585,9 +585,11 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
 {
     int i;
     PutBitContext pb;
-    uint8_t buffer[50000] = {0}, *p = buffer;
-    int buffer_len = sizeof buffer;
     int len, hlens[3];
+    int buffer_len = 50000;
+    uint8_t *buffer = av_mallocz(buffer_len), *p = buffer;
+    if (!buffer)
+        return AVERROR(ENOMEM);
 
     // identification header
     init_put_bits(&pb, p, buffer_len);
@@ -710,6 +712,7 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
         buffer_len += hlens[i];
     }
 
+    av_freep(&buffer);
     return p - *out;
 }