[FFmpeg-devel] [PATCH] avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color()

Paul B Mahol onemda at gmail.com
Sat Jun 13 20:33:02 CEST 2015


Dana 13. 6. 2015. 11:46 osoba "Michael Niedermayer" <michaelni at gmx.at>
napisala je:
>
> Theres currently no case where this could be triggered
>
> Found-by: Daemon404
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  libavfilter/drawutils.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
> index 3a1abbd..5a82b10 100644
> --- a/libavfilter/drawutils.c
> +++ b/libavfilter/drawutils.c
> @@ -21,6 +21,7 @@
>
>  #include <string.h>
>
> +#include "libavutil/avassert.h"
>  #include "libavutil/avutil.h"
>  #include "libavutil/colorspace.h"
>  #include "libavutil/mem.h"
> @@ -66,7 +67,11 @@ int ff_fill_line_with_color(uint8_t *line[4], int
pixel_step[4], int w, uint8_t
>      uint8_t rgba_map[4] = {0};
>      int i;
>      const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt);
> -    int hsub = pix_desc->log2_chroma_w;
> +    int hsub;
> +
> +    av_assert0(pix_desc);
> +
> +    hsub = pix_desc->log2_chroma_w;
>
>      *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0;
>
> --
> 1.7.9.5
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Also LGTM


More information about the ffmpeg-devel mailing list