aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-17 01:31:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-17 02:14:25 +0100
commitda811dfc93a9e3d5f9669acd3dd5f1703b8cb21e (patch)
treec76716c6395a0a471c2b42ca8981ec0280373dc0
parentdce726f0914fa34523420e34faf2ef696ddcea1e (diff)
downloadffmpeg-da811dfc93a9e3d5f9669acd3dd5f1703b8cb21e.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>
-rw-r--r--libavcodec/h264.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b94f06b6d1..cb7e6f9246 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -338,6 +338,7 @@ typedef struct H264Picture {
* H264Context
*/
typedef struct H264Context {
+ AVClass *av_class;
AVCodecContext *avctx;
MECmpContext mecc;
VideoDSPContext vdsp;