From patchwork Thu May 25 14:12:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3735 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp819157vsk; Thu, 25 May 2017 07:13:47 -0700 (PDT) X-Received: by 10.28.232.18 with SMTP id f18mr9469751wmh.101.1495721627807; Thu, 25 May 2017 07:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495721627; cv=none; d=google.com; s=arc-20160816; b=mjHTnGRsE3z+HknxEHVv+CmwrGJYyqX0UvkOXk4OVsPUPD5tzpWvgsnK0D3Tqm/WBj BK+YwahiW8+wbXBxMbVsytCMshFYV3GwGQer4W15KFs/Rb1izBtrSjpSOjwFi/feGWNu HR5+8VT/Y/04lq4vzVGv1m2i9bxqapjSwvRBU9W1DTk/Tk96k2ZyqHUfhwpbRGyPZHQJ 1Er+Su9ASoovwGulEsNRkb2EfnjrYxo26Bk1D1dtOobLxqXXLGSNLyeOInwiYutPVWid DnK2qOFqDU+9RRU2a/iKLkBWhf7iwu1Atf3uMDBxaUvnOZKmiChfRUxZa109iTbjr4d0 4Kzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=2bLuMKJolfjI2OBcrq9YlJZIaodI/I0pxL+xicZhUTY=; b=nt4t1BO/NIKJMB69WVEHjFf/kKv2oEKLlIy6DPSFsWujo30H/ln2Od/60KjQQ0bMFs hx8yMSSjJ1JVP/D3kaNMp1+GOIf8+WkPQ9fIRezX6puwfQNgPsu5W3l+aIGog17vBVyE Qbmhphu3hTZ8BAGlvkWKLeny4dyvL2aNfB1lHmg+yUSTIytFAQ5A9OXmd0lNuue2SE5Q xJC00NWDoTm8nqQRv8gLkZeOyrYzfIrbW6Qj243X9XkH40n9JYtocSoLd/WPMpi4RVg6 s3NsB86MHEsCGSYqh8UGaVq+/67tr+e+EpA8mIAXsHxpA+vc5Ld0R/TORYeHC1AU7/8g f5pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j67si10227277wmg.92.2017.05.25.07.13.47; Thu, 25 May 2017 07:13:47 -0700 (PDT) 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=@gmail.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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2778C689C12; Thu, 25 May 2017 17:13:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 826BF689B55 for ; Thu, 25 May 2017 17:13:35 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id j13so30279322qta.3 for ; Thu, 25 May 2017 07:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=XPSR7gH3mq8TsAiuezxuJ7OCeUSVmrN/+y2/GQwixw8=; b=LcE451ZpfhFs5855cy/aEA0W65m64fVcuW4OwRmrsfMgRpL8WiTHSgEMzKWU9+abF4 pnMPPZBuBeiWdLhavKKRihU32nl6cHo99kTnwfY5HgmJrR2L/YHtCb2rT8HvKREiU9/g agcqPrnWRmFYGRIpDqVlmL20q65TxPrXoZ9zwYSQn2naZdL3UK6yYJrx6IhK2Qcpx/u/ lWjchxjTfI2Jc12kAzClzmflV76myANI0Uwea1QDYdemPN9PRlLhHuwcWvTIC0bdbn2H VDPjnxowq8sZ0IcMkj5QsihIarreWeHFxhjnCOZ9EtLoc1NM97oPXP9qJLhWWoKDsiMR 5eQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=XPSR7gH3mq8TsAiuezxuJ7OCeUSVmrN/+y2/GQwixw8=; b=LZ1OehjUPl5sUsSVMxNluBF61ZaBHYY7V/RbBjrCAqLxU9UkSrLFCuByzaqMDGYqlv LSB4S3f2f1NQPUcvnCVlds/jL5UUrHNC5gCK5jJou3mtWu+XrDAa1hZ5y7oY34eyTNmU SExWI/WZCIUi6mrio4tUVEIN6+EeoSpoPFZCfBAj4EyCAJtpfAiubZ23FheQDtk6nXG9 u5jeNX/HyWAza/+8KVz7wfWuYKyDMN5AhP5/iRs0jDpy3jef5IRmFOS67I4wVksLCH7a 0tztgeoK71DQUW+hW4l11qQHZ3Z6g2bVEoWmXQ5iXAmclRst3bcsVlA/sak1V0gt7pxY 9duQ== X-Gm-Message-State: AODbwcAPXWFNHIwW5cUWgfS+yrhlfwpKGeBSukx9GqHI7ea/aaunCsC+ 4l66ufKl8R3YzrxK X-Received: by 10.200.53.187 with SMTP id k56mr44605040qtb.104.1495721616985; Thu, 25 May 2017 07:13:36 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id h14sm4787126qta.18.2017.05.25.07.13.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 07:13:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 May 2017 11:12:47 -0300 Message-Id: <20170525141248.2204-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/audiotoolboxdec: always use a copy of the AVCodecContext 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes memleaks introduced by 954e2b3d34b7c2d82871254f07e2f8a39bc451cb Signed-off-by: James Almer --- Untested. libavcodec/audiotoolboxdec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index a8655f0421..d499a0afc8 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -399,8 +399,13 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, AVPacket *pkt) static av_cold int ffat_init_decoder(AVCodecContext *avctx) { ATDecodeContext *at = avctx->priv_data; - at->extradata = avctx->extradata; - at->extradata_size = avctx->extradata_size; + if (avctx->extradata_size) { + at->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!at->extradata) + return AVERROR(ENOMEM); + at->extradata_size = avctx->extradata_size; + memcpy(at->extradata, avctx->extradata, avctx->extradata_size); + } if ((avctx->channels && avctx->sample_rate) || ffat_usable_extradata(avctx)) return ffat_create_decoder(avctx, NULL); @@ -599,6 +604,7 @@ static av_cold int ffat_close_decoder(AVCodecContext *avctx) av_packet_unref(&at->new_in_pkt); av_packet_unref(&at->in_pkt); av_free(at->decoded_data); + av_free(at->extradata); return 0; }