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:37 +0100
commit45bb57e009e444639399682fde583a4379ebbda9 (patch)
treea4d3590dc0272eb2d8d9358e582adde3e7c7d879
parentec0f77fbff904bb735c9923c3cdd916ca6ac9c88 (diff)
downloadffmpeg-45bb57e009e444639399682fde583a4379ebbda9.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 8761a61708..1ea88ddc16 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -255,6 +255,7 @@ typedef struct MMCO {
* H264Context
*/
typedef struct H264Context {
+ AVClass *av_class;
AVCodecContext *avctx;
VideoDSPContext vdsp;
H264DSPContext h264dsp;