]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/vf_scale: Fix adding 0 to NULL (which is UB) in scale_slice()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 19 Feb 2021 20:43:45 +0000 (21:43 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 31 Mar 2021 21:09:35 +0000 (23:09 +0200)
Found-by: Jeremy Leconte <jleconte@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_scale.c

index 58eee967440657798f84383ec6f79e8a05c3ece0..5ad9334d02cbb5685fe43a7cd32a173502941701 100644 (file)
@@ -635,8 +635,8 @@ static int scale_slice(AVFilterLink *link, AVFrame *out_buf, AVFrame *cur_pic, s
         int vsub= ((i+1)&2) ? scale->vsub : 0;
          in_stride[i] = cur_pic->linesize[i] * mul;
         out_stride[i] = out_buf->linesize[i] * mul;
-         in[i] = cur_pic->data[i] + ((y>>vsub)+field) * cur_pic->linesize[i];
-        out[i] = out_buf->data[i] +            field  * out_buf->linesize[i];
+         in[i] = FF_PTR_ADD(cur_pic->data[i], ((y>>vsub)+field) * cur_pic->linesize[i]);
+        out[i] = FF_PTR_ADD(out_buf->data[i],            field  * out_buf->linesize[i]);
     }
     if (scale->input_is_pal)
          in[1] = cur_pic->data[1];