[FFmpeg-devel] [PATCH 5/5] avcodec/flicvideo: Use bytestream2_get_buffer() in flic_decode_frame_15_16BPP() for FLI_COPY
Michael Niedermayer
michael at niedermayer.cc
Fri Sep 27 00:10:57 EEST 2019
Fixes: Timeout(103sec -> 3sec)
Fixes: 17678/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLIC_fuzzer-5715436989054976
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/flicvideo.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 276c2ff2a6..e559f3d449 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -738,6 +738,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height;
y_ptr += s->frame->linesize[0]) {
+#if HAVE_BIGENDIAN
pixel_countdown = s->avctx->width;
pixel_ptr = 0;
while (pixel_countdown > 0) {
@@ -745,6 +746,9 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
pixel_ptr += 2;
pixel_countdown--;
}
+#else
+ bytestream2_get_buffer(&g2, pixels + y_ptr, 2*s->avctx->width);
+#endif
if (s->avctx->width & 1)
bytestream2_skip(&g2, 2);
}
--
2.23.0
More information about the ffmpeg-devel
mailing list