virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/movtextenc: Don't presume every style to have a font

Browse Source 
Fixes segfaults in the absence of fonts; this can happen because the
file didn't contain any or because the allocation of the font-string
failed.

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 0dd7b8232d)
This commit is contained in:
Andreas Rheinhardt 2020-10-16 16:33:23 +02:00
parent f4d7dba3ce
commit 0f70a8ae19
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/movtextenc.c
View File

@ -298,10 +298,14 @@ static int encode_sample_description(AVCodecContext *avctx)
// is avaiable in the ASS header
if (style && ass->styles_count) {
// Find unique font names
av_dynarray_add(&s->fonts, &s->font_count, style->font_name);
font_names_total_len += strlen(style->font_name);
if (style->font_name) {
av_dynarray_add(&s->fonts, &s->font_count, style->font_name);
font_names_total_len += strlen(style->font_name);
}
for (i = 0; i < ass->styles_count; i++) {
int found = 0;
if (!ass->styles[i].font_name)
continue;
for (j = 0; j < s->font_count; j++) {
if (!strcmp(s->fonts[j], ass->styles[i].font_name)) {
found = 1;