RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 2e67a99fbc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-04-24 12:30:20 +02:00
parent 76060ae4e9
commit f2c6a5d0bd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_drawtext.c
View File

@ -1210,7 +1210,9 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame,
dummy.code = code; dummy.code = code;
glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL); glyph = av_tree_find(s->glyphs, &dummy, glyph_cmp, NULL);
if (!glyph) { 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); y_min = FFMIN(glyph->bbox.yMin, y_min);