aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-17 01:31:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-30 15:38:20 +0100
commitac499d8142f38f0f82aa06a4cf425498ee19c32f (patch)
tree838097d6594f2e941def5c8c9ab0b5c238609367 /libavcodec
parent9354c47d2ec9133cbb7fd82dc049f6eba07fc154 (diff)
downloadffmpeg-ac499d8142f38f0f82aa06a4cf425498ee19c32f.tar.gz
avcodec/h264: make the first field of H264Context an AVClass
Fixes use of freed memory Fixes: asan_heap-uaf_3660f67_757_cov_1257014655_Hi422FR1_SONY_A.jsv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f3b5b139ad853b6f69c6a0b036815a60e7b3f261) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 872d09d6a8..bc7db9f298 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -284,6 +284,7 @@ typedef struct MMCO {
* H264Context
*/
typedef struct H264Context {
+ AVClass *av_class;
AVCodecContext *avctx;
VideoDSPContext vdsp;
H264DSPContext h264dsp;