From patchwork Tue Feb 6 06:56:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Allmann X-Patchwork-Id: 7517 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp3745979jai; Mon, 5 Feb 2018 22:57:48 -0800 (PST) X-Google-Smtp-Source: AH8x2276rWvUs+A/bKe0oq8erK9qZERl+YNYQbFDD7g5/7cKosTb7HPmDoMcGrBrUFW2iWvwagDX X-Received: by 10.223.130.206 with SMTP id 72mr1245787wrc.248.1517900268742; Mon, 05 Feb 2018 22:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517900268; cv=none; d=google.com; s=arc-20160816; b=R+nkQ0uvGxobcsz0OTUJSwUd+KINpQfPkFm9trBghdEdLO4jgGQIFxi3lvIX2adXXh rCAvokq1plUMT7Qqx4nvENbcXxQ+y64lCrU5MB0XigvgOojPMCMBidIXagFKyNhKsFcq 8qtjIU5UJF5Ks5vWR/ZLZXScrwVqlKDpB5x91ZnDVJl/FGFw6BH6Ge9dGyE6zNPbwVa+ HlMxEX79I/zDqiQ08c6VozUejnWwmV+3wzgrzEvPbNNCaGj/MB1lHIMYvTEQN3iDSrzK zDdds1vPH852AbQrTWVQZgiAU+lxAapyppNKOanNxQ5zy6QHa/h8jJb+Pq21ggqfMC+i fVjg== 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=ohnsQlfnL9MnL+GYZK8kz+a7YaM0BtQgbcBvTBA65qU=; b=t9Y8ZJp8dXUaSOT9NOR5svrXqgfJmfDuDnmlu8L6138/Z5O53Jc7dpn4XTjs4EMvLD YnU+hYAhYvbKPE/fF8Z7DWmIGUB1ebJLGwlHMsZ25SB/dP77iwybguFXAMfZAyanAwfJ 2kI/wpuqEbbPdjbYN/ie9AEDMf8b3hYt8Rv5FTA8YybqiM+D0HFKaDLRpEC5DUPnQIP8 SgMLS2Lanmqkatr8RFJhFhxarQy2YlUqNf/RVFkNkAN+UtL9ozwMSu5l5kkWG23sVWje PCMrivyllgS42OuncTDpOfby7C4PgpvTdVcvtnHTHTO1c3W3vH/It/h0oqJUqeqq+RoV AmnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aIuvciLj; 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 i130si6527222wmf.178.2018.02.05.22.57.47; Mon, 05 Feb 2018 22:57:48 -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=@gmail.com header.s=20161025 header.b=aIuvciLj; 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 55DBC68049B; Tue, 6 Feb 2018 08:57:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f51.google.com (mail-pg0-f51.google.com [74.125.83.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D277680348 for ; Tue, 6 Feb 2018 08:57:32 +0200 (EET) Received: by mail-pg0-f51.google.com with SMTP id w17so739993pgv.6 for ; Mon, 05 Feb 2018 22:57:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fY7OaLTluDHlN2lvY0qQ0aF6SZ8FaPTiQuYnwkZR2Kw=; b=aIuvciLjC1dXzXuI6W62zXA3X1BII/iJBZ0fdQZmlKdxPivN2S2XHNZnheGrZ3yQJb K+CLLrn+QCfq/ESs5haurcX29Sgio5u9vU5SrliYhjAgi0uQtiqRJNEr7s8LK/jy9Swl 12m3qvaK7sW7honNa6KgPCSrmI8poBOdU7rHBY/AK1Ppusv8TyjUVlwVn15Ao0xlUVXc C5PByawzi3w4cGTTUllIZGL0D9i2LlaP8cSeWdor5QXhwNrFkYPULCj4Fk0KTpBJN0Ao dNnIRI+BpO7B4M3L1SY5mnhVdLNPCouyOhL5kM90E2ubc98ymoY9u/KdTQThobR2Xv4O byzQ== 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=fY7OaLTluDHlN2lvY0qQ0aF6SZ8FaPTiQuYnwkZR2Kw=; b=kKJha/bd7cHUhPcS8nebOzCxyQW0E8Y8OJFQFUVY2ZFK1T/iK5wSdwERv3loVM3rQu Na+Yxb29wsQ6mUagmh9rTWiqwRUNaiSaT0fOanagOwLqDVjjWxPCcW4G8UXq7KTCOord XgKQBkRzk5nqkaaC+jk9rq6dNqNDallOkEUhHbk7IxD052FUWT9tfVL3SRS5KVDmVHN/ 9a6MPJcx2UB25fiKT+XdBNFqls76qP+TgH95SRiAXgnfa+DJXAPX9WgquAsKqkS71xL1 Bw80WK/UMXP9+dWA1JokRIDFppCWY+d/ub9zZI7p7PieHUkonXCOGzL4tZTokQ132EX4 EWaA== X-Gm-Message-State: APf1xPCkPI3P8MAsmgsDAiLPL+Se5z535IaBTeFOZikgZH5NGS/J0N54 ogcFtkh31cOUuE4KNsM9sC94W9ao X-Received: by 10.98.24.80 with SMTP id 77mr1437187pfy.145.1517900258064; Mon, 05 Feb 2018 22:57:38 -0800 (PST) Received: from localhost.localdomain (cpe-76-172-80-40.socal.res.rr.com. [76.172.80.40]) by smtp.gmail.com with ESMTPSA id n80sm21767277pfj.79.2018.02.05.22.57.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Feb 2018 22:57:37 -0800 (PST) From: Josh Allmann To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Feb 2018 22:56:35 -0800 Message-Id: <1517900195-1879-1-git-send-email-joshua.allmann@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] aacenc: Free any extradata before re-allocating. 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 a leak that occurs if avctx->extradata contains any data prior to opening the codec, eg left over from an initialization call to avcodec_parameters_from_context. --- libavcodec/aacenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 6d94c76905..f8fbe69d87 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -98,6 +98,10 @@ static int put_audio_specific_config(AVCodecContext *avctx) int channels = (!s->needs_pce)*(s->channels - (s->channels == 8 ? 1 : 0)); const int max_size = 32; + if (avctx->extradata) { + av_freep(&avctx->extradata); + avctx->extradata_size = 0; + } avctx->extradata = av_mallocz(max_size); if (!avctx->extradata) return AVERROR(ENOMEM);