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

avformat/mov: Fix memleaks upon read_header failure 

By default, a demuxer's read_close function is not called automatically
if an error happens when reading the header; instead it is up to the
demuxer to clean up after itself in this case. The mov demuxer did this
by calling its read_close function when it encountered some errors when
reading the header. Yet for other errors (mostly adding side-data to
streams) this has been forgotten, so that all the internal structures
of the demuxer leak.

This commit fixes this by making sure mov_read_close is called when
necessary.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit ac378c535b)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-14 00:37:40 +02:00
parent ecfe87bdef
commit bb03a54e40
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavformat/mov.c
View File

@ -7425,14 +7425,13 @@ static int mov_read_header(AVFormatContext *s)
avio_seek(pb, 0, SEEK_SET);
if ((err = mov_read_default(mov, pb, atom)) < 0) {
av_log(s, AV_LOG_ERROR, "error reading header\n");
mov_read_close(s);
return err;
goto fail;
}
} while ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mov->found_moov && !mov->moov_retry++);
if (!mov->found_moov) {
av_log(s, AV_LOG_ERROR, "moov atom not found\n");
mov_read_close(s);
return AVERROR_INVALIDDATA;
err = AVERROR_INVALIDDATA;
goto fail;
}
av_log(mov->fc, AV_LOG_TRACE, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb));
@ -7485,7 +7484,7 @@ static int mov_read_header(AVFormatContext *s)
}
if (st->codecpar->codec_id == AV_CODEC_ID_DVD_SUBTITLE) {
if ((err = mov_rewrite_dvd_sub_extradata(st)) < 0)
return err;
goto fail;
}
}
if (mov->handbrake_version &&
@ -7505,8 +7504,8 @@ static int mov_read_header(AVFormatContext *s)
if (sc->data_size > INT64_MAX / sc->time_scale / 8) {
av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
sc->data_size, sc->time_scale);
mov_read_close(s);
return AVERROR_INVALIDDATA;
err = AVERROR_INVALIDDATA;
goto fail;
}
st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale / st->duration;
}
@ -7521,8 +7520,8 @@ static int mov_read_header(AVFormatContext *s)
if (sc->data_size > INT64_MAX / sc->time_scale / 8) {
av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
sc->data_size, sc->time_scale);
mov_read_close(s);
return AVERROR_INVALIDDATA;
err = AVERROR_INVALIDDATA;
goto fail;
}
st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale /
sc->duration_for_fps;
@ -7546,8 +7545,7 @@ static int mov_read_header(AVFormatContext *s)
case AVMEDIA_TYPE_AUDIO:
err = ff_replaygain_export(st, s->metadata);
if (err < 0) {
mov_read_close(s);
return err;
goto fail;
}
break;
case AVMEDIA_TYPE_VIDEO:
@ -7555,7 +7553,7 @@ static int mov_read_header(AVFormatContext *s)
err = av_stream_add_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, (uint8_t*)sc->display_matrix,
sizeof(int32_t) * 9);
if (err < 0)
return err;
goto fail;
sc->display_matrix = NULL;
}
@ -7564,7 +7562,7 @@ static int mov_read_header(AVFormatContext *s)
(uint8_t *)sc->stereo3d,
sizeof(*sc->stereo3d));
if (err < 0)
return err;
goto fail;
sc->stereo3d = NULL;
}
@ -7573,7 +7571,7 @@ static int mov_read_header(AVFormatContext *s)
(uint8_t *)sc->spherical,
sc->spherical_size);
if (err < 0)
return err;
goto fail;
sc->spherical = NULL;
}
@ -7582,7 +7580,7 @@ static int mov_read_header(AVFormatContext *s)
(uint8_t *)sc->mastering,
sizeof(*sc->mastering));
if (err < 0)
return err;
goto fail;
sc->mastering = NULL;
}
@ -7591,7 +7589,7 @@ static int mov_read_header(AVFormatContext *s)
(uint8_t *)sc->coll,
sc->coll_size);
if (err < 0)
return err;
goto fail;
sc->coll = NULL;
}
@ -7605,6 +7603,9 @@ static int mov_read_header(AVFormatContext *s)
mov->frag_index.item[i].headers_read = 1;
return 0;
fail:
mov_read_close(s);
return err;
}
static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)