diff mbox

[FFmpeg-devel,3/3] avformat/oggdec: fix leak in ogg_restore()

Message ID 20170228143112.13750-3-michael@niedermayer.cc
State Accepted
Commit e46ab997506e8aa84344c29553ebacca7993904c
Headers show

Commit Message

Michael Niedermayer Feb. 28, 2017, 2:31 p.m. UTC 
Fixes: asan_bug_leak

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/oggdec.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 98cd0f55c7..edeae2ba83 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -127,8 +127,12 @@  static int ogg_restore(AVFormatContext *s)
 
     ogg->state = ost->next;
 
-        for (i = 0; i < ogg->nstreams; i++)
+        for (i = 0; i < ogg->nstreams; i++) {
             av_freep(&ogg->streams[i].buf);
+            if (i >= ost->nstreams || !ost->streams[i].private) {
+                free_stream(s, i);
+            }
+        }
 
         avio_seek(bc, ost->pos, SEEK_SET);
         ogg->page_pos = -1;