From 526aca805f778a94654672c5ddc8ef766fee63c5 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 24 Apr 2016 12:30:20 +0200
Subject: [PATCH] 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>
---
libavfilter/vf_drawtext.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 16e3383db0..a0cb222fa0 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -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);