aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 01:12:47 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-08-08 14:57:01 +0100
commit437848e37ae7ef73cd8101031dc570d1f009ffd5 (patch)
treeac589fbd9a16bed17362d837c0717ba8c0c8c8cb /libavcodec
parentaddbaf134836aea4e14f73add8c6d753a1373257 (diff)
downloadffmpeg-437848e37ae7ef73cd8101031dc570d1f009ffd5.tar.gz
vp3: Copy all 3 frames for thread updates
Fixes a double release of the current frame on deinit. Bug-Id: CVE-2011-3934 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vp3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 1d68c09ad6..c33436398a 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1869,7 +1869,7 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *
||s->width != s1->width
||s->height!= s1->height) {
if (s != s1)
- copy_fields(s, s1, golden_frame, current_frame);
+ copy_fields(s, s1, golden_frame, keyframe);
return -1;
}