Fixes: Timeout (21->18sec)
Fixes: 
14124/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PICTOR_fuzzer-5633887734071296

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
 libavcodec/pictordec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index af99c486b8..2e6fcdca52 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -68,10 +68,10 @@ static void picmemset(PicContext *s, AVFrame *frame, 
unsigned value, int run,
     int planel = *plane;
     value   <<= shift;
 
+    d = frame->data[0] + yl * frame->linesize[0];
     while (run > 0) {
         int j;
         for (j = 8-bits_per_plane; j >= 0; j -= bits_per_plane) {
-            d = frame->data[0] + yl * frame->linesize[0];
             d[xl] |= (value >> j) & mask;
             xl += 1;
             if (xl == s->width) {
@@ -85,6 +85,7 @@ static void picmemset(PicContext *s, AVFrame *frame, unsigned 
value, int run,
                    value <<= bits_per_plane;
                    mask  <<= bits_per_plane;
                 }
+                d = frame->data[0] + yl * frame->linesize[0];
             }
         }
         run--;
-- 
2.21.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to