Browse Source

avcodec/pthread_frame: clear priv_data, avoid stale pointer in error case

Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.11
Michael Niedermayer 10 years ago
parent
commit
e3bacdbaad
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavcodec/pthread_frame.c

+ 1
- 0
libavcodec/pthread_frame.c View File

@@ -671,6 +671,7 @@ int ff_frame_thread_init(AVCodecContext *avctx)


copy->internal = av_malloc(sizeof(AVCodecInternal)); copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) { if (!copy->internal) {
copy->priv_data = NULL;
err = AVERROR(ENOMEM); err = AVERROR(ENOMEM);
goto error; goto error;
} }


Loading…
Cancel
Save