aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:27:11 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-01 21:38:25 +0200
commit8bfc38893b37a167d1f668c90f5a0741122b5ff3 (patch)
tree443f7e16d3f004c7d8755a43097f7cd563c95948
parent1e6a52841c2d298444d1c876bc8bb395d64e20dc (diff)
downloadffmpeg-8bfc38893b37a167d1f668c90f5a0741122b5ff3.tar.gz
avformat/subviewerdec: 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 a708f652737eba08607df84394ca4bec6b458736) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/subviewerdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c
index 06b827b70f..25fe7ac9a6 100644
--- a/libavformat/subviewerdec.c
+++ b/libavformat/subviewerdec.c
@@ -162,6 +162,8 @@ static int subviewer_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &subviewer->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&subviewer->q);
av_bprint_finalize(&header, NULL);
return res;
}