From patchwork Mon Nov 28 23:33:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1597 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp2129994vsb; Mon, 28 Nov 2016 15:33:28 -0800 (PST) X-Received: by 10.194.82.69 with SMTP id g5mr20587089wjy.155.1480376008867; Mon, 28 Nov 2016 15:33:28 -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 il9si45533308wjb.140.2016.11.28.15.33.26; Mon, 28 Nov 2016 15:33:28 -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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D402689DD3; Tue, 29 Nov 2016 01:33:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BC66689A68 for ; Tue, 29 Nov 2016 01:33:13 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id u144so21580717wmu.0 for ; Mon, 28 Nov 2016 15:33:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=TECgSMdxU+vdOesZKHyNusaafWaw/ZGe4q2nopcAQOU=; b=I7VKpO8T5vfqUGfBkTDH1yv09Xb5/M4ZH4g/y2Q9zLe2D3qOZhmGumx7eo2wN2iixc gxdpo28/l99q6fjn5Av/2quJfx1pR8K4Ig2MvMNewkL72FrUMvleA33QuShhxkn2ubG+ v8+1ZUoyR1UMcEcRCBu8BPkbOLc68W6FrQ6c2i7FnQyvAapi4y/mH/SCTeYKzNjdInW1 ugpl4afLH4sUpsuYG9UhxscJB/9k3GZN6KWSNO0MCk3fTEN2ua8ukrL97T7i2RFrgkjK cDyzwT/0ADfovuAd4bxV9UDuKPNaNxls5G7RGdXQl524S+pxjkWdM1lmxj83VzUi7m35 NBJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=TECgSMdxU+vdOesZKHyNusaafWaw/ZGe4q2nopcAQOU=; b=lHsltGo54N1l9pF1/FiH+FRJtZPijdz7oYsDYusvxGk7LLyl91rE8lbMzsU3T4HczR 9jXSSpjHcAlbUtMn2JDWMi3NSzzsK5IZgoDUtODbDKpWUmb3fLz6sVTrTApHbs5ZZ+iz Z7awiHNwsobuAETYyfZu96pq4eHH96EJFLZkfA1vKVxcIo9P/Kwf4xUrPyTA8ODMhFM4 QHtMdmhld6OMRE4pSSTOPpxmCja0fEQlxP10XraUT0DgozCBFrHK7D28YHU2bv84lrVt lQnFKjyRQaIpch7Rs+30RFwniiv9H2O3CC16D6W3qjuW4AgKlwMJuvehO9jtDlTVh7r2 HIcg== X-Gm-Message-State: AKaTC02A4pUODd+n/XYJ/9SGbMV8Ytw7zzCpH9EvpTmvUbBWg0qDNpJ3WiGkfldJ80QgKw== X-Received: by 10.28.41.70 with SMTP id p67mr21065861wmp.4.1480375998765; Mon, 28 Nov 2016 15:33:18 -0800 (PST) Received: from [192.168.2.21] (p5B095B3E.dip0.t-ipconnect.de. [91.9.91.62]) by smtp.googlemail.com with ESMTPSA id v10sm64911080wji.29.2016.11.28.15.33.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 15:33:18 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Tue, 29 Nov 2016 00:33:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avidec: fix leaking extradata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Cadhalpun --- libavformat/avidec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e5a292e..97dbeae 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -770,6 +770,7 @@ FF_ENABLE_DEPRECATION_WARNINGS st->codecpar->extradata_size = esize - 10 * 4; } else st->codecpar->extradata_size = size - 10 * 4; + av_freep(&st->codecpar->extradata); if (ff_get_extradata(s, st->codecpar, pb, st->codecpar->extradata_size) < 0) return AVERROR(ENOMEM); } @@ -925,6 +926,7 @@ FF_ENABLE_DEPRECATION_WARNINGS st = s->streams[stream_index]; if (size<(1<<30)) { + av_freep(&st->codecpar->extradata); if (ff_get_extradata(s, st->codecpar, pb, size) < 0) return AVERROR(ENOMEM); }