highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/idctdsp: Transmit studio_profile to init instead of using AVCodecContext profile

Browse Source 
These 2 fields are not always the same, it is simpler to always use the same field
for detecting studio profile

Fixes: null pointer dereference
Fixes: ffmpeg_crash_3.avi

Found-by: Thuan Pham <thuanpv@comp.nus.edu.sg>, Marcel Böhme, Andrew Santosa and Alexandru RazvanCaciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2018-05-28 21:19:08 +02:00
parent 1aa5192451
commit b3332a182f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/idctdsp.c
View File

@@ -258,7 +258,7 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
if (avctx->bits_per_raw_sample == 10 || avctx->bits_per_raw_sample == 9) { if (avctx->bits_per_raw_sample == 10 || avctx->bits_per_raw_sample == 9) {
/* 10-bit MPEG-4 Simple Studio Profile requires a higher precision IDCT /* 10-bit MPEG-4 Simple Studio Profile requires a higher precision IDCT
However, it only uses idct_put */ However, it only uses idct_put */
if (avctx->codec_id == AV_CODEC_ID_MPEG4 && avctx->profile == FF_PROFILE_MPEG4_SIMPLE_STUDIO) if (c->mpeg4_studio_profile)
c->idct_put = ff_simple_idct_put_int32_10bit; c->idct_put = ff_simple_idct_put_int32_10bit;
else { else {
c->idct_put = ff_simple_idct_put_int16_10bit; c->idct_put = ff_simple_idct_put_int16_10bit;

2
libavcodec/idctdsp.h
View File

@@ -95,6 +95,8 @@ typedef struct IDCTDSPContext {
*/ */
uint8_t idct_permutation[64]; uint8_t idct_permutation[64];
enum idct_permutation_type perm_type; enum idct_permutation_type perm_type;
int mpeg4_studio_profile;
} IDCTDSPContext; } IDCTDSPContext;
void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels,

2
libavcodec/mpegvideo.c
View File

@@ -329,6 +329,8 @@ static av_cold int dct_init(MpegEncContext *s)
av_cold void ff_mpv_idct_init(MpegEncContext *s) av_cold void ff_mpv_idct_init(MpegEncContext *s)
{ {
if (s->codec_id == AV_CODEC_ID_MPEG4)
s->idsp.mpeg4_studio_profile = s->studio_profile;
ff_idctdsp_init(&s->idsp, s->avctx); ff_idctdsp_init(&s->idsp, s->avctx);
/* load & permutate scantables /* load & permutate scantables