[FFmpeg-cvslog] avcodec/utils: Use av_memcpy_backptr() in ff_color_frame()
Michael Niedermayer
git at videolan.org
Tue Sep 24 18:55:22 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Sep 8 17:25:07 2019 +0200| [340ab13504dddb71889f518983174d7bac7cfe96] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=340ab13504dddb71889f518983174d7bac7cfe96
---
libavcodec/utils.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c48ada599a..07da197927 100644
--- a/libavcodec/utils.c
+++ b/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])
{
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);
@@ -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;
for (y = 0; y < height; y++) {
if (desc->comp[0].depth >= 9) {
- for (x = 0; x<bytes; x++)
- ((uint16_t*)dst)[x] = c[p];
+ ((uint16_t*)dst)[0] = c[p];
+ av_memcpy_backptr(dst + 2, 2, bytes - 2);
}else
memset(dst, c[p], bytes);
dst += frame->linesize[p];
More information about the ffmpeg-cvslog
mailing list