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

Michael Niedermayer michaelni at gmx.at
Sat Jun 13 00:05:19 CEST 2015


Theres currently no case where this could be triggered but adding this
provides future robustness

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 0b2f17e..4385398 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -66,7 +66,12 @@ 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;
+
+    if (!pix_desc)
+        return AVERROR(EINVAL);
+
+    hsub = pix_desc->log2_chroma_w;
 
     *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0;
 
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list