From patchwork Tue Oct 13 02:30:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22895 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 CC47D449230 for ; Tue, 13 Oct 2020 05:31:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F42E68BB34; Tue, 13 Oct 2020 05:31:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CC4768B9E6 for ; Tue, 13 Oct 2020 05:30:57 +0300 (EEST) Received: by mail-pg1-f170.google.com with SMTP id l18so7319411pgg.0 for ; Mon, 12 Oct 2020 19:30:57 -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=QuJQo+cKqewTkS2vAajaYSw8hGzmt7R4Mytghkc7eGI=; b=mWZFlvC3XQ6fMmgReebQzpaFOyTJAor7Pt1TrGWk5g20Y2nGvxWi6lEjDsKc6otJkZ ltiW0+he0TSWNEUqOfEWRiHTh9c9/sH7XjyxF2P3SLNN7f6yylf0ynqNhsLyzKzQqRbX l3cLr0qCNrQMmnslzXowZzeaIwaD6F/m8G/adJ0ZGtRfrAS81hp8jS7jcqa54HX/Vrrz CiuMfkNtJK39tMX9LdGlBUhZnk5XrSogFlP6OA+PodzGjk7L+DU6fDcYOLI5W1+M4E7m BqUnAea5sxzSX0Br68J21pVX99B/tQdqyAw3ReL/TEgKcS3UD0l+8na9EK35KLmTf131 uWNw== 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=QuJQo+cKqewTkS2vAajaYSw8hGzmt7R4Mytghkc7eGI=; b=OVn9hqAyG9qXsxULXfHH/yMARyvPMbKSy9T4T1of5Iq1MtSyaXwaC9QpYoickuXwOv oatn7vB1iotjJ0X5nIWYMzT9vnaI9CMaUR/0Qw8c9IdAsQOTtyDdCaXD9kL8Px6MX+0g jHNln7WUP7W93i7suln9L5JNGLozDN9vFudXnH+IZGu9Q1dX3h13a3OUBlvDJAFjxgSD HYLQnIz8YQqZWeaqXOKHFRhmtn5VQ13PqvfOR2K8t3SXOYwlUsCxRMaPBldVrC+dRwz5 R1AS5NcqiohDq1yo5v5xQIzpo50kSksNZFF6X1sn779VOASFctntMnQiisKd/CU0PR4q vfRg== X-Gm-Message-State: AOAM531QebdYi2f7VVWIo3Ru6TlXte6bv2csu9JHtGeOuWRpbqVrJObW kz/j+CZsYFSfEhCExSfuEs27IDiD5cWHztZ+ X-Google-Smtp-Source: ABdhPJzcFEpZi0AZj8CsCUd89UFSjOlADTR5yH6yUy+yOcL68bnBeIZdxG9Azh6hDswPoo4jDGfoWg== X-Received: by 2002:a17:90a:160f:: with SMTP id n15mr22794059pja.75.1602556254911; Mon, 12 Oct 2020 19:30:54 -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 e5sm7975618pfl.216.2020.10.12.19.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 19:30:54 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 13:30:47 +1100 Message-Id: <20201013023047.59308-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..5309d884a5 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);