From patchwork Tue Oct 13 03:30:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22899 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 065F444809E for ; Tue, 13 Oct 2020 06:30:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7CAD68BB35; Tue, 13 Oct 2020 06:30:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CB8C68BAA3 for ; Tue, 13 Oct 2020 06:30:39 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id c20so5184128pfr.8 for ; Mon, 12 Oct 2020 20:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miceli-net-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2/jxCg/6YFiSDhNn7LOrFPHdhK1K9PmjaBzFCWsZn+w=; b=BmQxV7Ow5KwmHu77mzXG9CTSHizzIVWmQiaPC0hKnLsigoZWWvgZHAZh/26DVL/mAK EvRBjTMc3j3l4nImevXZhIXm/Pn8Dum8zOt5yEEmt4X3sWzw1B9i/90KZx3+OyNufu8Y BLQ9pKTKCdYI+COWSJvCgHdEokbc7zt2ad0vxq9biD7YqY38MXQgxwE3pZwv0UfUr1Rc gj1oW3fpgIamMBe43A5+15Gs+Hd5CW1UQt/1ubldzoxHhcLkeFeB7XjQC5SVz/vfMSZV hFz3mq9PoXroo70y+FsGBdnHrdx8/mB9HjrY9noACCgrvLJVUC+WIeO6Nyo4KI1DjrU5 16Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2/jxCg/6YFiSDhNn7LOrFPHdhK1K9PmjaBzFCWsZn+w=; b=X2Uq9hJpWKRd9CunZOUqj4f2+/jXWzH75UDwnw7uC+BzJ7VNVCNzWrWxu9apqrDVIr BZWQ3HxJetdT3+nLI63ZOz1wvQbmuPJwWG1cjrPwDBxSazswMxOA4yNeWFHx3D/+qbxA iuNun8whqDjZeeH3gMQ20+QW1hsEtKxqPwP/rxDx7K/X4NH8z6LJ7j5JzLt2PFykvVvc 0TjmPDZNbggM88dNUgkr62fbPQxcc79G+G/XLOzX6g/GtGrGXo0euHEUOO3xDORIRnrR Q0X0W4vpdVZm4OJHUPdT0GTGdYy/tkHSQHrqNgT9IcyhcpjpwR5cH2PleQ6SMZ1fbL/O Uxdw== X-Gm-Message-State: AOAM532rv56VFaA1HLCxGo7HoU/HTuMRIEhFwGPrKV2+WcVVG6EnQaRx ZgP8AF/i74XZoEQQlwJKk52GYN6YgD4v0lF+ X-Google-Smtp-Source: ABdhPJzs7GBZfkppp2pvYn6l/YP3Stp1NqbmvFBmF8MrqZLQfItpxcSWpyyxlCWNUjYlZ7Lel7wWBQ== X-Received: by 2002:a17:90a:f0c7:: with SMTP id fa7mr19469915pjb.152.1602559837264; Mon, 12 Oct 2020 20:30:37 -0700 (PDT) Received: from edna.localdomain (119-18-3-107.771203.syd.nbn.aussiebb.net. [119.18.3.107]) by smtp.gmail.com with ESMTPSA id z190sm22225761pfc.89.2020.10.12.20.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 20:30:36 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 14:30:04 +1100 Message-Id: <20201013033004.98462-1-chris@miceli.net.au> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavfilter/af_mcompand: Check for failure to allocate memory 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 Cc: Chris Miceli Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit fixes some unchecked memory allocations from #8931. --- libavfilter/af_mcompand.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index f142573bea..96293909de 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -386,8 +386,17 @@ static int config_output(AVFilterLink *outlink) } s->bands[i].attack_rate = av_calloc(outlink->channels, sizeof(double)); + if (!s->bands[i].attack_rate) + return AVERROR(ENOMEM); + s->bands[i].decay_rate = av_calloc(outlink->channels, sizeof(double)); + if (!s->bands[i].decay_rate) + return AVERROR(ENOMEM); + s->bands[i].volume = av_calloc(outlink->channels, sizeof(double)); + if (!s->bands[i].volume) + return AVERROR(ENOMEM); + for (k = 0; k < FFMIN(nb_attacks / 2, outlink->channels); k++) { char *tstr3 = av_strtok(p3, ",", &saveptr3);