avcodec/utils: Use av_memcpy_backptr() in ff_color_frame()

Fixes: Timeout (191sec -> 53sec)
Fixes: 16908/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5711207859748864
Fixes: 10709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5630617975259136

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/323/head
Michael Niedermayer 5 years ago
parent 033d2c4884
commit 340ab13504
  1. 6
      libavcodec/utils.c

@ -412,7 +412,7 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
void ff_color_frame(AVFrame *frame, const int c[4]) void ff_color_frame(AVFrame *frame, const int c[4])
{ {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
int p, y, x; int p, y;
av_assert0(desc->flags & AV_PIX_FMT_FLAG_PLANAR); av_assert0(desc->flags & AV_PIX_FMT_FLAG_PLANAR);
@ -423,8 +423,8 @@ void ff_color_frame(AVFrame *frame, const int c[4])
int height = is_chroma ? AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height; int height = is_chroma ? AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height;
for (y = 0; y < height; y++) { for (y = 0; y < height; y++) {
if (desc->comp[0].depth >= 9) { if (desc->comp[0].depth >= 9) {
for (x = 0; x<bytes; x++) ((uint16_t*)dst)[0] = c[p];
((uint16_t*)dst)[x] = c[p]; av_memcpy_backptr(dst + 2, 2, bytes - 2);
}else }else
memset(dst, c[p], bytes); memset(dst, c[p], bytes);
dst += frame->linesize[p]; dst += frame->linesize[p];

Loading…
Cancel
Save