[FFmpeg-cvslog] avcodec/pictordec: Optimize more odd cases for picmemset()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Aug 31 19:48:18 2021 +0200| [31f03120e8d03775c67404af11dc7d5fb90f590c] | committer: Michael Niedermayer

avcodec/pictordec: Optimize more odd cases for picmemset()

Fixes: Timeout
Fixes: 36875/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PICTOR_fuzzer-4842960888922112

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Tested-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31f03120e8d03775c67404af11dc7d5fb90f590c
---

 libavcodec/pictordec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index c37c5e7106..c7b3a335d3 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -89,8 +89,7 @@ static void picmemset(PicContext *s, AVFrame *frame, unsigned value, int run,
                 d = frame->data[0] + yl * frame->linesize[0];
                 if (s->nb_planes == 1 &&
                     run*pixels_per_value >= s->width &&
-                    pixels_per_value < s->width &&
-                    s->width % pixels_per_value == 0
+                    pixels_per_value < (s->width / pixels_per_value * pixels_per_value)
                     ) {
                     for (; xl < pixels_per_value; xl ++) {
                         j = (j < bits_per_plane ? 8 : j) - bits_per_plane;
@@ -98,7 +97,7 @@ static void picmemset(PicContext *s, AVFrame *frame, unsigned value, int run,
                     }
                     av_memcpy_backptr(d+xl, pixels_per_value, s->width - xl);
                     run -= s->width / pixels_per_value;
-                    xl = s->width;
+                    xl = s->width / pixels_per_value * pixels_per_value;
                 }
             }
         }