generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/drawutils: Assert av_pix_fmt_desc_get() return value in ff_fill_line_with_color()

Browse Source 
Theres currently no case where this could be triggered

Found-by: Daemon404
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-12 23:40:09 +02:00
parent 8978052869
commit a98d4d5207
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/drawutils.c
View File

@ -21,6 +21,7 @@
#include <string.h> #include <string.h>
#include "libavutil/avassert.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#include "libavutil/mem.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}; uint8_t rgba_map[4] = {0};
int i; int i;
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); 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; *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0;