aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:21:46 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-15 17:25:47 +0200
commit6e64260a190a9549d12953dc779cb88e69cdaaac (patch)
tree4c0f89cc14634f7adb51063399a9dfd3910f479d
parent7754a2ea12afda7edaafab32b37d6423618a406f (diff)
downloadffmpeg-6e64260a190a9549d12953dc779cb88e69cdaaac.tar.gz
avformat/samidec: 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 or when creating extradata. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> (cherry picked from commit f161f8e4ad10c8ae5b2e97870e09bc6a421408eb)
-rw-r--r--libavformat/samidec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index fd98393086..3070ef9bac 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -108,6 +108,8 @@ static int sami_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &sami->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&sami->q);
av_bprint_finalize(&buf, NULL);
return res;
}