summaryrefslogtreecommitdiff
path: root/libavfilter/vf_drawtext.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-04-24 12:30:20 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-24 12:39:25 +0200
commit2e67a99fbc6b99315925de40fc6fa7161576be10 (patch)
tree31a91a948eaf763dafce4e61d217e05214f6fce6 /libavfilter/vf_drawtext.c
parent64ae08ffec1a07803dc1acdb6d0bcd8e628040c2 (diff)
downloadffmpeg-2e67a99fbc6b99315925de40fc6fa7161576be10.tar.gz
avfilter/vf_drawtext: Check return code of load_glyph()
Fixes segfault Fixes Ticket5347 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_drawtext.c')
-rw-r--r--libavfilter/vf_drawtext.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 6b9af5b425..214aef0f2f 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -1224,7 +1224,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);