RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy() 

Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3197c0aa87)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-18 11:24:45 +02:00
parent e693af81b7
commit 05684cee42
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/rv34.c
View File

@ -1534,7 +1534,14 @@ int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx)
if (avctx->internal->is_copy) { if (avctx->internal->is_copy) {
r->tmp_b_block_base = NULL; r->tmp_b_block_base = NULL;
r->cbp_chroma = NULL;
r->cbp_luma = NULL;
r->deblock_coefs = NULL;
r->intra_types_hist = NULL;
r->mb_type = NULL;
ff_mpv_idct_init(&r->s); ff_mpv_idct_init(&r->s);
if ((err = ff_mpv_common_init(&r->s)) < 0) if ((err = ff_mpv_common_init(&r->s)) < 0)
return err; return err;
if ((err = rv34_decoder_alloc(r)) < 0) { if ((err = rv34_decoder_alloc(r)) < 0) {