On Sat, Jan 27, 2018 at 09:54:51AM +0100, Paul B Mahol wrote:
> On 1/24/18, Michael Niedermayer <mich...@niedermayer.cc> wrote:
> > Fixes out of array access
> > Fixes: poc.mp4
> >
> > Found-by: GwanYeong Kim <gy741....@gmail.com>
> > Signed-off-by: Michael Niedermayer <mich...@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@ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
>
> Unfortunately this will not work for packed rgb formats.posted a patch fixing this thanks for spotting this [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The real ebay dictionary, page 1 "Used only once" - "Some unspecified defect prevented a second use" "In good condition" - "Can be repaird by experienced expert" "As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
