aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:23:27 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-15 17:30:32 +0200
commit157bbc779c5124b7f6aee39df6399425f12dc2e2 (patch)
tree5a43645d0d210cc95e08d40a423d037008397f6b /libavformat
parentbf29cf8eb6f5fadcec2c32522612eb0c453e2581 (diff)
downloadffmpeg-157bbc779c5124b7f6aee39df6399425f12dc2e2.tar.gz
avformat/srtdec: 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 c70409957c7332971f0e147729d769f6d2f95390)
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/srtdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 40d324b44d..d6ff00ba6d 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -207,6 +207,8 @@ static int srt_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &srt->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&srt->q);
av_bprint_finalize(&buf, NULL);
return res;
}