[FFmpeg-devel] [PATCH] avfilter/vf_transpose: Fix used plane count.

Paul B Mahol onemda at gmail.com
Sat Jan 27 10:54:51 EET 2018


On 1/24/18, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes out of array access
> Fixes: poc.mp4
>
> Found-by: GwanYeong Kim <gy741.kim at gmail.com>
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavfilter/vf_transpose.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
> index 982fb0c8ca..1e1a5c4b89 100644
> --- a/libavfilter/vf_transpose.c
> +++ b/libavfilter/vf_transpose.c
> @@ -27,6 +27,7 @@
>
>  #include <stdio.h>
>
> +#include "libavutil/avassert.h"
>  #include "libavutil/imgutils.h"
>  #include "libavutil/internal.h"
>  #include "libavutil/intreadwrite.h"
> @@ -54,6 +55,7 @@ enum TransposeDir {
>  typedef struct TransContext {
>      const AVClass *class;
>      int hsub, vsub;
> +    int planes;
>      int pixsteps[4];
>
>      int passthrough;    ///< PassthroughType, landscape passthrough mode
> enabled
> @@ -215,6 +217,10 @@ static int config_props_output(AVFilterLink *outlink)
>
>      s->hsub = desc_in->log2_chroma_w;
>      s->vsub = desc_in->log2_chroma_h;
> +    s->planes = desc_in->nb_components;
> +
> +    av_assert0(desc_in->nb_components == desc_out->nb_components);
> +
>
>      av_image_fill_max_pixsteps(s->pixsteps, NULL, desc_out);
>
> @@ -272,7 +278,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg,
> int jobnr,
>      AVFrame *in = td->in;
>      int plane;
>
> -    for (plane = 0; out->data[plane]; plane++) {
> +    for (plane = 0; plane < s->planes; plane++) {
>          int hsub    = plane == 1 || plane == 2 ? s->hsub : 0;
>          int vsub    = plane == 1 || plane == 2 ? s->vsub : 0;
>          int pixstep = s->pixsteps[plane];
> --
> 2.15.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

Unfortunately this will not work for packed rgb formats.


More information about the ffmpeg-devel mailing list