summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <[email protected]>2020-06-14 03:24:23 +0200
committerAndreas Rheinhardt <[email protected]>2020-07-03 00:02:14 +0200
commitf596a7325536ebbd1c3737c266ff60b7c39eb9fa (patch)
tree4403b5424450fa58771c42092bd9557067f1bfa4
parent280f6bcddd956a3a4b37f5ef2b2ddb1a960f1f9a (diff)
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 <[email protected]> (cherry picked from commit e13874b9eae4e156ca1c478e6d59d3461bbdc09f) Signed-off-by: Andreas Rheinhardt <[email protected]>
-rw-r--r--libavformat/stldec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/stldec.c b/libavformat/stldec.c
index 35de49322c..87bf0724a9 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;