From patchwork Tue Oct 13 04:20:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22900 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 42C8344902E for ; Tue, 13 Oct 2020 07:20:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23FED68BB37; Tue, 13 Oct 2020 07:20:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AD1A68ACEC for ; Tue, 13 Oct 2020 07:20:43 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id h6so16636440pgk.4 for ; Mon, 12 Oct 2020 21:20:43 -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=rGitOGHLSNGyvixxrorDSZSCvT1DLrctaPG3SvlBvn7YYZdg+lu4CN5wJhbYCCIxzb 6GGjkdLjQvafmsIg7/iYkQL1JbGPtUKeIcboskx463/j27pCsc8LQKsANwIJosHn6yEl 0ZUu23Ya6xVnbh176oCI2z3iFPkh3Uw8DOtIvkaMTjp5L8y2saZ2Q5Kww9w0ZayOTKVI 40MMFMP6fyz4OrkYBCq9keQrBSA4/pIiSDCRBCkV5BnLRE38eGqqlutPCvmgxX1ACvBX 3TNz07Ug+Gx9yLA8n0oO+OhoRB7h/CqxhpVwyV280WXcrSTYFkz8Fqt8Yp7Ix7v/+h/v emDA== 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=CCP3BzTu4Vlqzg6uv4SwcvAUUg0yw2Pd3Tr5sqjA5MXg/jO6WdBLf2QmuD62YIFP7c mDYtgXjxvLbT74VqPTVkJPjWEhD9WB8EsU23lo+qQV0+Vru2pOY+0V5yaei6hCNQC913 sTQemD6FOFv8MZ6M2LIxFW0QvYfU7hfylCyI64TUQbNGLqOk2XirU6bz2N86/YMeHnJW T7CWR4ZrZ3sFUfWFdgZ0ioONEmt0P5cc4uOCqLKVaExbBMWchYwfrb8VuShpPrrzo9su cwkzsRcw0GOadg+S+T5T1G5mUJfBbtu6yf/mBmsPj70n6O5dflW9880gfx/ac6eU960p QjIg== X-Gm-Message-State: AOAM533lZvFwTw2hFwEK0YJH4ZtHRf1HTct07lZVcsHqFZJVyUREQwBS iW0virICnTfE3j9lexITp7SFTrfZZ6M+TXjL X-Google-Smtp-Source: ABdhPJy/+B25JXjYquKaRRpc85GnblrLxyWc8ZCRMpV58amprp5ayLrn5CeUIjWGDDGlhG3LY/8FGw== X-Received: by 2002:a63:cd48:: with SMTP id a8mr14887224pgj.83.1602562841359; Mon, 12 Oct 2020 21:20:41 -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 jx17sm25085408pjb.10.2020.10.12.21.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 21:20:40 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 15:20:34 +1100 Message-Id: <20201013042034.154846-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);