ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Thu Jun 16 19:06:10 2022 +0200| [49a63c6c6609c8ccb6c5c5f7474c9900a7e2cb8f] | committer: Andreas Rheinhardt
avformat/matroskaenc: Reset cur_master_element when discarding master Before this patch the muxer writes an invalid file (namely one in which the Projection master is a child of the Colour element) if the following conditions are met: a) The stream contains AVMasteringDisplayMetadata without primaries and luminance (i.e. useless AVMasteringDisplayMetadata). b) The stream contains AV_PKT_DATA_SPHERICAL side data. c) All the colour elements of the stream are equal to default (i.e. unknown). Fortunately these conditions are very unlikely to be met. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49a63c6c6609c8ccb6c5c5f7474c9900a7e2cb8f --- libavformat/matroskaenc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 482b5812e5..297346be84 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -444,15 +444,25 @@ static void ebml_writer_close_master(EbmlWriter *writer) av_assert2(writer->current_master_element < writer->nb_elements); elem = &writer->elements[writer->current_master_element]; av_assert2(elem->type == EBML_MASTER); + av_assert2(elem->priv.master.nb_elements < 0); /* means unset */ elem->priv.master.nb_elements = writer->nb_elements - writer->current_master_element - 1; + av_assert2(elem->priv.master.containing_master < 0 || + elem->priv.master.containing_master < writer->current_master_element); writer->current_master_element = elem->priv.master.containing_master; } static void ebml_writer_close_or_discard_master(EbmlWriter *writer) { av_assert2(writer->nb_elements > 0); + av_assert2(0 <= writer->current_master_element); + av_assert2(writer->current_master_element < writer->nb_elements); if (writer->current_master_element == writer->nb_elements - 1) { + const EbmlElement *const elem = &writer->elements[writer->nb_elements - 1]; /* The master element has no children. Discard it. */ + av_assert2(elem->type == EBML_MASTER); + av_assert2(elem->priv.master.containing_master < 0 || + elem->priv.master.containing_master < writer->current_master_element); + writer->current_master_element = elem->priv.master.containing_master; writer->nb_elements--; return; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
