[FFmpeg-cvslog] avformat/pjsdec: Fix memleak upon read header failure

Andreas Rheinhardt git at videolan.org
Fri Jul 3 03:11:45 EEST 2020


ffmpeg | branch: release/3.4 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:21:03 2020 +0200| [7b5f24a142286bd37ec7ada6ae6d20551217ba50] | committer: Andreas Rheinhardt

avformat/pjsdec: 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 at gmail.com>
(cherry picked from commit 9df560e8986640e20c62286f0baee2a80540accd)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b5f24a142286bd37ec7ada6ae6d20551217ba50
---

 libavformat/pjsdec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/pjsdec.c b/libavformat/pjsdec.c
index 448962bf8a..b4ae1fa10f 100644
--- a/libavformat/pjsdec.c
+++ b/libavformat/pjsdec.c
@@ -94,8 +94,10 @@ static int pjs_read_header(AVFormatContext *s)
 
             p[strcspn(p, "\"")] = 0;
             sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0);
-            if (!sub)
+            if (!sub) {
+                ff_subtitles_queue_clean(&pjs->q);
                 return AVERROR(ENOMEM);
+            }
             sub->pos = pos;
             sub->pts = pts_start;
             sub->duration = duration;



More information about the ffmpeg-cvslog mailing list