1. ffmpeg
  2. Commit 526aca805f778a94654672c5ddc8ef766fee63c5
Browse code

avfilter/vf_drawtext: Check return code of load_glyph()

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>

Michael Niedermayer authored on 2016/04/24 19:30:20
Showing 1 changed files
libavfilter/vf_drawtext.c
History View file @ 526aca8
... ... 
@@ -1210,7 +1210,9 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame,
1210 1210 
         dummy.code = code;
1211 1211 
         glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL);
1212 1212 
         if (!glyph) {
1213 
-            load_glyph(ctx, &glyph, code);
1213 
+            ret = load_glyph(ctx, &glyph, code);
1214 
+            if (ret < 0)
1215 
+                return ret;
1214 1216 
         }
1215 1217
1216 1218 
         y_min = FFMIN(glyph->bbox.yMin, y_min);