diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-24 12:30:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-28 03:47:13 +0200 |
| commit | 526aca805f778a94654672c5ddc8ef766fee63c5 (patch) | |
| tree | bdc6e704d2c9740c1783385bf61c037e5dda413d | |
| parent | cec42e6f4de3b040fac34eb99dc1acbb2cfdcbee (diff) | |
| download | ffmpeg-526aca805f778a94654672c5ddc8ef766fee63c5.tar.gz | |
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>
| -rw-r--r-- | libavfilter/vf_drawtext.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |