diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-24 12:30:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-24 12:41:09 +0200 |
| commit | f2e9e4757f7d02ff84018138577b2321e123b6a9 (patch) | |
| tree | c2631e432fe4164c5455dddaeaec877534dfaaa4 /libavfilter | |
| parent | 512c064cd9e064fccd5809bc0928822a7324373d (diff) | |
| download | android_external_ffmpeg-f2e9e4757f7d02ff84018138577b2321e123b6a9.tar.gz android_external_ffmpeg-f2e9e4757f7d02ff84018138577b2321e123b6a9.tar.bz2 android_external_ffmpeg-f2e9e4757f7d02ff84018138577b2321e123b6a9.zip | |
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>
Diffstat (limited to 'libavfilter')
| -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 1ef3ecb31f..65c2c58b6f 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1222,7 +1222,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); |