sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

avcodec/ratecontrol: check the picture number in ff_get_2pass_fcode()

Browse Source 
Fixes: out of array read
Fixes: H7ATVBRB6ALZ
Found during the review of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24758
Out of array read Replicated through UnModified FFmpeg with ASAN
This commit is contained in:
Michael Niedermayer
2026-10-12 02:06:36 +02:00
committed by michaelni
parent 30455d58d2
commit 863ca906a1
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo_enc.c
View File

@@ -3710,7 +3710,9 @@ static int encode_picture(MPVMainEncContext *const m, const AVPacket *pkt)
ret = estimate_qp(m, 1);
if (ret < 0)
return ret;
ff_get_2pass_fcode(m);
ret = ff_get_2pass_fcode(m);
if (ret < 0)
return ret;
} else if (!(s->c.avctx->flags & AV_CODEC_FLAG_QSCALE)) {
if (s->c.pict_type == AV_PICTURE_TYPE_B)
s->lambda = m->last_lambda_for[s->c.pict_type];

11
libavcodec/ratecontrol.c
View File

@@ -900,14 +900,21 @@ static void adaptive_quantization(RateControlContext *const rcc,
}
}
void ff_get_2pass_fcode(MPVMainEncContext *const m)
int ff_get_2pass_fcode(MPVMainEncContext *const m)
{
MPVEncContext *const s = &m->s;
const RateControlContext *rcc = &m->rc_context;
const RateControlEntry *rce = &rcc->entry[s->picture_number];
const RateControlEntry *rce;
if (s->picture_number >= rcc->num_entries) {
av_log(s->c.avctx, AV_LOG_ERROR, "Input is longer than 2-pass log file\n");
return AVERROR(EINVAL);
}
rce = &rcc->entry[s->picture_number];
s->f_code = rce->f_code;
s->b_code = rce->b_code;
return 0;
}
// FIXME rd or at least approx for dquant

2
libavcodec/ratecontrol.h
View File

@@ -100,7 +100,7 @@ int ff_rate_control_init(MPVMainEncContext *m);
float ff_rate_estimate_qscale(MPVMainEncContext *m, int dry_run);
void ff_write_pass1_stats(MPVMainEncContext *m);
int ff_vbv_update(MPVMainEncContext *m, int frame_size);
void ff_get_2pass_fcode(MPVMainEncContext *m);
int ff_get_2pass_fcode(MPVMainEncContext *m);
void ff_rate_control_uninit(RateControlContext *rcc);
#endif /* AVCODEC_RATECONTROL_H */