aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:24:23 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-15 17:30:32 +0200
commit3201350dc753ec8c8f2c28f3e4f58ff42e7a742b (patch)
tree5b0924279fcf385231ac9f975803b5602067aed4
parent157bbc779c5124b7f6aee39df6399425f12dc2e2 (diff)
downloadffmpeg-3201350dc753ec8c8f2c28f3e4f58ff42e7a742b.tar.gz
avformat/stldec: Fix memleak upon read header failure
The already parsed subtitles (contained in an FFDemuxSubtitlesQueue) would leak if an error happened upon reading a subsequent subtitle. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> (cherry picked from commit e13874b9eae4e156ca1c478e6d59d3461bbdc09f)
-rw-r--r--libavformat/stldec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/stldec.c b/libavformat/stldec.c
index d6e0713f8c..fb67407ac5 100644
--- a/libavformat/stldec.c
+++ b/libavformat/stldec.c
@@ -97,8 +97,10 @@ static int stl_read_header(AVFormatContext *s)
if (pts_start != AV_NOPTS_VALUE) {
AVPacket *sub;
sub = ff_subtitles_queue_insert(&stl->q, p, strlen(p), 0);
- if (!sub)
+ if (!sub) {
+ ff_subtitles_queue_clean(&stl->q);
return AVERROR(ENOMEM);
+ }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = duration;