[FFmpeg-cvslog] flacdec: Fix used AVCodecContext

Michael Niedermayer git at videolan.org
Thu Jun 13 22:32:39 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 22:11:07 2013 +0200| [c112e36d41da5eb25af3230e2365737759e75375] | committer: Michael Niedermayer

flacdec: Fix used AVCodecContext

Fixes out of array writes with multiple threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c112e36d41da5eb25af3230e2365737759e75375
---

 libavcodec/flacdec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 2d3e4b3..a0c950b 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -498,6 +498,7 @@ static int flac_decode_frame(AVCodecContext *avctx, void *data,
     int ret;
 
     *got_frame_ptr = 0;
+    s->avctx = avctx;
 
     if (s->max_framesize == 0) {
         s->max_framesize =



More information about the ffmpeg-cvslog mailing list