git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8dad213
)
avcodec/pthread_frame: clear priv_data, avoid stale pointer in error case
author
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 16 Jul 2015 09:52:33 +0000
(11:52 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 16 Jul 2015 10:18:30 +0000
(12:18 +0200)
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>
libavcodec/pthread_frame.c
patch
|
blob
|
history
diff --git
a/libavcodec/pthread_frame.c
b/libavcodec/pthread_frame.c
index
df372e0
..
8987c12
100644
(file)
--- a/
libavcodec/pthread_frame.c
+++ b/
libavcodec/pthread_frame.c
@@
-690,6
+690,7
@@
int ff_frame_thread_init(AVCodecContext *avctx)
copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) {
+ copy->priv_data = NULL;
err = AVERROR(ENOMEM);
goto error;
}