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

avcodec/movtextenc: Ignore unmatched closing style tags 

The existing code will segfault if a closing tag shows up when there
was never an opening tag. This isn't a well formed style, but it's also
not a reason to crash.

Fixes: https://trac.ffmpeg.org/ticket/6303
This commit is contained in:
Philip Langdale 2017-04-23 10:42:25 -07:00
parent 6ba1c9bf7e
commit f95c81ce10
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/movtextenc.c
View File

@ -57,6 +57,8 @@ typedef struct {
} HilightcolorBox; } HilightcolorBox;
typedef struct { typedef struct {
AVCodecContext *avctx;
ASSSplitContext *ass_ctx; ASSSplitContext *ass_ctx;
AVBPrint buffer; AVBPrint buffer;
StyleBox **style_attributes; StyleBox **style_attributes;
@ -187,6 +189,7 @@ static av_cold int mov_text_encode_init(AVCodecContext *avctx)
}; };
MovTextContext *s = avctx->priv_data; MovTextContext *s = avctx->priv_data;
s->avctx = avctx;
avctx->extradata_size = sizeof text_sample_entry; avctx->extradata_size = sizeof text_sample_entry;
avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
@ -247,6 +250,9 @@ static void mov_text_style_cb(void *priv, const char style, int close)
s->style_attributes_temp->style_flag |= STYLE_FLAG_UNDERLINE; s->style_attributes_temp->style_flag |= STYLE_FLAG_UNDERLINE;
break; break;
} }
} else if (!s->style_attributes_temp) {
av_log(s->avctx, AV_LOG_WARNING, "Ignoring unmatched close tag\n");
return;
} else { } else {
s->style_attributes_temp->style_end = AV_RB16(&s->text_pos); s->style_attributes_temp->style_end = AV_RB16(&s->text_pos);
av_dynarray_add(&s->style_attributes, &s->count, s->style_attributes_temp); av_dynarray_add(&s->style_attributes, &s->count, s->style_attributes_temp);