Browse Source

avformat/matroskaenc: Check functions that can fail

Sometimes it has not been checked whether opening the dynamic buffer for
writing Tags fails; this might have led to segfaults.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b4f300f8ea)
tags/n4.2.3
Andreas Rheinhardt 6 years ago
parent
commit
12efc04b3b
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      libavformat/matroskaenc.c

+ 7
- 2
libavformat/matroskaenc.c View File

@@ -1578,7 +1578,9 @@ static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid,
ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_TAGS, avio_tell(s->pb));
if (ret < 0) return ret;

start_ebml_master_crc32(&mkv->tags_bc, mkv);
ret = start_ebml_master_crc32(&mkv->tags_bc, mkv);
if (ret < 0)
return ret;
}
pb = mkv->tags_bc;

@@ -1674,7 +1676,10 @@ static int mkv_write_tags(AVFormatContext *s)
if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
continue;

mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tag_target);
ret = mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID,
i + 1, &tag_target);
if (ret < 0)
return ret;
pb = mkv->tags_bc;

tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);


Loading…
Cancel
Save