From patchwork Tue Feb 28 14:31:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 2699 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp1477678vsf; Tue, 28 Feb 2017 06:32:01 -0800 (PST) X-Received: by 10.28.37.195 with SMTP id l186mr18011155wml.73.1488292321254; Tue, 28 Feb 2017 06:32:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h132si8153008wmf.127.2017.02.28.06.32.00; Tue, 28 Feb 2017 06:32:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 654716891D5; Tue, 28 Feb 2017 16:31:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C11E968055F for ; Tue, 28 Feb 2017 16:31:40 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1ciioh-0007tC-2G for ffmpeg-devel@ffmpeg.org; Tue, 28 Feb 2017 15:31:51 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id qEXF1u00j0S5wYM01EXGrD; Tue, 28 Feb 2017 15:31:16 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 28 Feb 2017 15:31:12 +0100 Message-Id: <20170228143112.13750-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228143112.13750-1-michael@niedermayer.cc> References: <20170228143112.13750-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/oggdec: fix leak in ogg_restore() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: asan_bug_leak Found-by: Thomas Guilbert Signed-off-by: Michael Niedermayer --- libavformat/oggdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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;