diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-14 03:21:03 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-03 16:15:57 +0200 |
| commit | 9003b8f5de4ab7362cbf5e21ac1207f40098dbfc (patch) | |
| tree | 0fa83152f9c654746b7491fbfafb5b86e43cf637 | |
| parent | 1e0ab3a93b2c4f238084acc08cb8dd88abc1bf3a (diff) | |
| download | ffmpeg-9003b8f5de4ab7362cbf5e21ac1207f40098dbfc.tar.gz | |
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@gmail.com>
(cherry picked from commit 9df560e8986640e20c62286f0baee2a80540accd)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/pjsdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |