avfilter/vf_drawtext: Check return code of load_glyph()
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 24 Apr 2016 10:30:20 +0000 (12:30 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 27 Apr 2016 02:40:12 +0000 (04:40 +0200)
Fixes segfault
Fixes Ticket5347

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2e67a99fbc6b99315925de40fc6fa7161576be10)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_drawtext.c

index 16e3383..a0cb222 100644 (file)
@@ -1210,7 +1210,9 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame,
         dummy.code = code;
         glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL);
         if (!glyph) {
-            load_glyph(ctx, &glyph, code);
+            ret = load_glyph(ctx, &glyph, code);
+            if (ret < 0)
+                return ret;
         }
 
         y_min = FFMIN(glyph->bbox.yMin, y_min);