From patchwork Thu Sep 2 15:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29963 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp400879iov; Thu, 2 Sep 2021 08:43:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWZcVZDRNOntWxxtKZ9JHnedjWcUBNDwOjlrGW3eZocnGqYCC6JS+sSly+UhK/OK5V6VLD X-Received: by 2002:a17:906:544f:: with SMTP id d15mr4408120ejp.520.1630597393079; Thu, 02 Sep 2021 08:43:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h17si2335080edv.349.2021.09.02.08.43.12; Thu, 02 Sep 2021 08:43:13 -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=@outlook.com header.s=selector1 header.b=eYpHe33n; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6DEA68A67D; Thu, 2 Sep 2021 18:42:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064091.outbound.protection.outlook.com [40.92.64.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4060368A618 for ; Thu, 2 Sep 2021 18:41:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HnrQedsEsbUugI4WbiT5SQX3bZe0zn+eaUDUWHLfIzeHLytC5RkcaO8oamlaxIsWEc3SFum23C/jN8ToxSl/SUhfviuPjx4Y0fJ6r9qubW1JylpTodwJw7XhbYoY/Odr3es2JfhuP+/Cdv9JeEm01ElCG/A+sP0ZIPwRCPhO0VElTi66gyms/5t/En+PkN2Rm1PDy5VFbpqLuqHFe8w80hzyUgFb6/Es3uHtgK9tUuC8zTpZNrPEbQRN0D+vJN0TMEVEuKLmqcQaZFdzGumWbXbChWhyy9Ll/eyRp4mPnHrdunooxjoz7UG4iyk5rMg58LVkRPtYjQkCLPTX/nHzIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Ly0ayth1oib1zohARXoPvzTW3VIlajn2oTkjS/7gIw=; b=QLBcuYX3se7prHQk+9Yz85l/lcGYjF3jBTMHl13lyRlJ4lEHP+gbxAvS8ACVNvA+Dyhk+5rOMn1NZdnKWWcgqMVIZstJfg7ib00CH04xXoVs+75vhfnAs6Qx9Mtz5NTgnrJXTluRzf6CjPxogr32Jndeq4tc5PksxXSZ9xSJPN5Z1ODAEHoywaIhLsNlLoaG39+gagHUQ/2Ycc+PgkW4ttW9SJQKasO6oWRnEGNUerIFDtCCx0fj+CizBo6kHVOk3+2pC6NEDdy5iFnxAY4ssDDXGinSm2ooiQKqzPV+W/vKO+fkThREK77NZviXo7IALfDRx5rZh9TREIYy4LT90A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Ly0ayth1oib1zohARXoPvzTW3VIlajn2oTkjS/7gIw=; b=eYpHe33nDN60XNRuuxYsaZmAg1kGkNFM+V4V+5vsPhdQja8QCeirdH+5yYPC11N8wYVpD50Wc1+8SHqmN2U20au+16ObgOCLU174zpOytMb3rFOjn5q937Rj+qSp2AQHoZrwJnxzOctNNnL4svUuVQ8S1WcS6N18z9Wu+8qPDjRYhs/vFV/N47qtxBYgtULJYwCcerBvuCHFwMJma58w+k2Cz+nDetf3EmE7QTg9lq40p8vHjS/WPcG1Vv5X34lfaSDw/xnPIm25oHrA3a+NWMzioDZEGFwHfmXRh0qY1CfyCBahii1lfKxvmj2WpANr7aMjcLR5YswXH0y5cYli2w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6532.eurprd03.prod.outlook.com (2603:10a6:20b:1c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Thu, 2 Sep 2021 15:41:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Thu, 2 Sep 2021 15:41:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 17:41:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NzI5J1S0eQ+aYUQYjh4j9KyvU478gqa1] X-ClientProxiedBy: PR1P264CA0031.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19f::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210902154127.2571616-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1P264CA0031.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.20 via Frontend Transport; Thu, 2 Sep 2021 15:41:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02817939-56c4-4102-91fb-08d96e282b12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW7ZO6S4gJQgEvgNWj+v++jnly5rnj2Qw4MGrev5e9B61aRJyA8TdwGc75XiHzlR3P9mssnRPmN4hdhjhVYoGf9C60sr7KYUFX0jrJeeWWxuGJfDVPXIEpuP2hHSV72BgmcB1g9sjq9R5+fkpGbQtqJ6CqXptm3VNctRP9PcZlz1I6eJFTbneH3U1klQwq6AmfU+egr+iq0GUawx1PXf+gvbFpEdi4teZC1K7FAk34Aohu5lV2iGr8fnsfNnMqLQWHxEXPAppBIMFG4CP1YPrTuCLqWQvOaCTglhrVT2YcJM7yR+uEGi/A9LxgPBb4LJNf3FzJExLLPTu+8Uu2fCnzA01IGojDsiVYDMQwOX3kz5kqK/Jc7e03XcCboyBBd654g4wbwkEX/HXd6CsHvSLEpVxFWLRHY5fUfflZs7VtfD9udSw4MlXXIBJ+O42tEx6oh6xZ1Wa3YVnc7KK1bLBT0NFUpV//L+/vdaDIF01S9GmFvEIzRqlgg0gi3F71AOciKExYM3jpFZDmPRsTEk3Wfy5nUpw/UkFp6erPI0E19sacOb/AOcZB6qEp3EdVSNOKFI1jtTsrrRmQM42dOicICjP1MgZUJL3aYQRCBL8B+fjjw+1MES9VPe1TLqg36OP61uJdSoK0txAhDCd4ALMaT1kQnK0n0JOO1qz4Xck7bNcBUaM5Nb2oK/jqs6UYrDFy7U4sDKiN1hR1kJXuwNrJD2Wne/0VFXow= X-MS-TrafficTypeDiagnostic: AM7PR03MB6532: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bh9DXRLOD9IFFh/ufFb2kaCxMRU1aW8EfuSJRGlclqjq66SF56afDnVCEBw7tqocM914bTseAE7VzoNISJsMjoUA9+Vw1CeH+bUglF/mjA2PagaR2YkGhejPUYR60ldedF3R4QWirS+gk82Fn7aBKfBuKIvwdHHDbh3TvspfJOH1Y79gy5lMoKgLdcTL9GVjnWtOpFHEXBl4FJkQ8fjhOG1SZpNsi1/Iuh17brYl3bRb2cxs8IlY9za81bAbiblwQV5pR23WalJ/Yljnuzg6LtTSX/UFKsxgnXCFMU3MvngrVvsi4apqF3yjOKV6svn+HLryjX+NBVO9U15XsRnfF3dia3hv6STKQ319v0mFnMBzV5OWkhR259RvORRFVu89vN+5KHDrD5RrGurcU2NSwtZsN2CnllbgIA58CMmZyVAaNIh15noMjZw8ylGZge96 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5uj/aomQW4Fv66TYzFNcAy68xhtDdm2xaSu6vnnIRwhtVPOEb/FP+1uJ3/1VzBog96VLKk1b7h57+VOwFdUbYvxtx4FtFwlQ1kS4qWtUpfm1m0AkZusOqi8appx6Vz2aupXbjq6Fjj1efNrDxzfnZQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02817939-56c4-4102-91fb-08d96e282b12 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2021 15:41:45.2071 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6532 Subject: [FFmpeg-devel] [PATCH 04/13] avcodec/vp9: Don't free buffer known to be NULL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /habQtHMaOI3 Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 239475cdbe..8eb57eb8e6 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -62,11 +62,8 @@ static int vp9_alloc_entries(AVCodecContext *avctx, int n) { av_freep(&s->entries); s->entries = av_malloc_array(n, sizeof(atomic_int)); - - if (!s->entries) { - av_freep(&s->entries); + if (!s->entries) return AVERROR(ENOMEM); - } for (i = 0; i < n; i++) atomic_init(&s->entries[i], 0);