diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-14 04:09:08 +0300 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-02 11:15:08 +0300 |
| commit | 29b258cb260de91236f4f824370f310a3a644632 (patch) | |
| tree | 917d98c0c3b3f3dba1637ed113a06351a816748a | |
| parent | 7a38474ca05cf1f156c5dbce731f1d37aa4d115b (diff) | |
avformat/jacosubdec: 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 c13a752733a9af955b032c55f704b748fe37dd19)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/jacosubdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 520c435cc5..87dc649485 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -187,8 +187,10 @@ static int jacosub_read_header(AVFormatContext *s) AVPacket *sub; sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line); - if (!sub) - return AVERROR(ENOMEM); + if (!sub) { + ret = AVERROR(ENOMEM); + goto fail; + } sub->pos = pos; merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); continue; |