virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/matroskaenc: Don't segfault when seekability changes

Browse Source 
If the Matroska muxer's AVIOContext was unseekable when writing the
header, but is seekable when writing the trailer, the code for writing
the trailer presumes that a dynamic buffer exists and tries to update
its content in order to overwrite data that has already been
preliminarily written when writing the header, yet said buffer doesn't
exist as it has been written finally and not preliminarily when writing
the header (because of the unseekability it was presumed that one won't
be able to update the data anyway).

This commit adds a check for this and also for a similar situation
involving updating extradata with new data from packet side-data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-05-01 20:21:45 +02:00
parent 6275a7ec73
commit 8aabcf6c11
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/matroskaenc.c
View File

@ -2186,7 +2186,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt)
switch (par->codec_id) { switch (par->codec_id) {
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) { if (side_data_size && mkv->track.bc) {
int filler, output_sample_rate = 0; int filler, output_sample_rate = 0;
ret = get_aac_sample_rates(s, side_data, side_data_size, &track->sample_rate, ret = get_aac_sample_rates(s, side_data, side_data_size, &track->sample_rate,
&output_sample_rate); &output_sample_rate);
@ -2213,7 +2213,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt)
} }
break; break;
case AV_CODEC_ID_FLAC: case AV_CODEC_ID_FLAC:
if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) { if (side_data_size && mkv->track.bc) {
uint8_t *old_extradata = par->extradata; uint8_t *old_extradata = par->extradata;
if (side_data_size != par->extradata_size) { if (side_data_size != par->extradata_size) {
av_log(s, AV_LOG_ERROR, "Invalid FLAC STREAMINFO metadata for output stream %d\n", av_log(s, AV_LOG_ERROR, "Invalid FLAC STREAMINFO metadata for output stream %d\n",
@ -2229,8 +2229,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt)
// FIXME: Remove the following once libaom starts propagating extradata during init() // FIXME: Remove the following once libaom starts propagating extradata during init()
// See https://bugs.chromium.org/p/aomedia/issues/detail?id=2012 // See https://bugs.chromium.org/p/aomedia/issues/detail?id=2012
case AV_CODEC_ID_AV1: case AV_CODEC_ID_AV1:
if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live && if (side_data_size && mkv->track.bc && !par->extradata_size) {
!par->extradata_size) {
AVIOContext *dyn_cp; AVIOContext *dyn_cp;
uint8_t *codecpriv; uint8_t *codecpriv;
int codecpriv_size; int codecpriv_size;
@ -2541,6 +2540,7 @@ static int mkv_write_trailer(AVFormatContext *s)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (mkv->info.bc) {
// update the duration // update the duration
av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration); av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
avio_seek(mkv->info.bc, mkv->duration_offset, SEEK_SET); avio_seek(mkv->info.bc, mkv->duration_offset, SEEK_SET);
@ -2549,6 +2549,7 @@ static int mkv_write_trailer(AVFormatContext *s)
MATROSKA_ID_INFO, 0, 0, 0); MATROSKA_ID_INFO, 0, 0, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
if (mkv->track.bc) { if (mkv->track.bc) {
// write Tracks master // write Tracks master