From patchwork Thu Sep 2 15:41:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29960 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp400577iov; Thu, 2 Sep 2021 08:42:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwSjU3zox6jtoa54lgoeml+61ehaBFCVQ4kUDe0pI9dQ/Ul6gTPdpKhBPbIiDpEJ/Q6GTy X-Received: by 2002:a17:906:2bd0:: with SMTP id n16mr4482656ejg.132.1630597369296; Thu, 02 Sep 2021 08:42:49 -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 l15si2177463ejg.444.2021.09.02.08.42.48; Thu, 02 Sep 2021 08:42:49 -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=jbY8QOfN; 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 D1A8668A66B; Thu, 2 Sep 2021 18:42:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070098.outbound.protection.outlook.com [40.92.70.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EACC268A609 for ; Thu, 2 Sep 2021 18:41:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e3ZEOAv+OiaLABfOE6t6kogRXXigjXB9VeqlgADDnwFZmm4zGJqLA/qnLR7hX0bkXRdlW5gZ2pBAmso7PLkX3GWvBX8SzvhpjNm8X4NAaB+Tr81mJKeCTI6wF+JP+v2Z7EBe/GGDxSuwaMofuHFKcuvNVmEp9yzjyTB1SuLNyggcbsLGBrUcz2Bt5x4045n+FE40K6cjpS+i2WmOfygCQGY1SE+TCOtIXf+wqnQEejObnGqqgW0GZh3wp5aY4Vfch1OezJapx2xPAS49gKiGINtRdDxsiBYP+xCfnaOM62wsUw5HlR3xlMNAqXH+G2zqaaTmfFrO/pJgKp2Kw/jWBw== 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=62+yjjb4cg5dkd6xpT69KxtA9LxQvs0FxbEP6+TMAmM=; b=jWRDPzs/0NXMyKmoaaBJRz4JgXb/Yl6ftJqHOiX/VkmsS1xq3WuUOmIYEYRpDVprX+50eg/Pzf0UIAzOQimsO259Mx65yIdy6zZ5onPgCm2vs+LJ7r9JAEYs+9QTZmu+ujmEzuJ043L65TpZYDjZp2HvqbN8kCkv0hg5tGwGun87C67UYuCP+dKkuIEcsUi3Xxp3xJa6noAVzNTHtAC/UageMQrehwVuJ6M7yd/Mtbzta8DZZsytXkmcU1IYgyFTgtZuZSO+nTr9LZPgvRnHK19p5M4MJT2Oy2lQ676j/Z2mKBHW7ZNxUYfgwQzalH8FaOuowdPpJQOkNDr3tDaJ0A== 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=62+yjjb4cg5dkd6xpT69KxtA9LxQvs0FxbEP6+TMAmM=; b=jbY8QOfNRdRqRJrQ668kPLzqOgKBb0ntkNrjFT9Pq/eptmXrR5R7eJ0BW8OnTsdduDPplp1LHwdhHWbfV3vRmNH8ROkoRmKXU7Z9Pg5GZNLxSjne+FwHbOHvqI08NEqmJp1RIA4X0FNywWoTlT1Zhkmtyapjsq88Fvu5b/L3LhNVqVMQ+W8oxWjVGwaEF6lwsaZonrORKJrlhaTG7wXesTWcOmpi3dkhiCGWhYNgqIGYeHnQxyESub6125HmJEhXhoDp7mM3zT2nlgiSzlAXiY05elO3D8AeRKI50RLTRPKXOmLKixYaerLeueML5/Ulgmy3+4W87ePw44pQfAjm/w== 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:46 +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:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 17:41:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GzsvQTfh3+KlxvbVE1PFKL5Z4eA/wuk8] 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-4-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:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea0cdb75-5569-494b-9270-08d96e282bbc X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UI47HzvBIDxi1MyuBlz6AIUowHBf60J0CfwcSyFWrJylPNBp8EVEsRHpxV44rwpoXzrlyGRUC1qeMpsf4d9FMzOdKv39NDe5xukWHvPVy7QduxqbhfdYt9+U/JQgUlgP6JsPY11mgu7KPUX55kOfmPlepC2VKD0IZi5+CiRy5qkSMDHttKz0YFwnWYl2KdLXJzb+gQmF3uYc+9uZr3Gi7rgyVWYV1zsoZT6EOvMELgaDHZvvMe6zAlOnW7cZavB4TBIw/ox2YFHo2/naQSfm7HDw6eTpumZY4ovthXxshRbNptG76BuQ+4D2vwEIo8yBb45eF+zQC7I1vZbZkrebUj9aG93BFGAvVdkm3E6BY0t98qobbHhdAtUUxkzP4hVB2GTgOqFQDwbpCPybhJadwM3OmZaVOTMGYeIPidPgoQe8NP0Res8uBhY2Ep1bvudnEfxx8+GTbJnUa9tCJCUU7ccRXLZDTrWpF0b+gbEHcZNJqvenYFN0RyhHxn/ruenAgy8HXqmMeyWlIVtM+rzx+OyiE7OJykpr9QH8cK5FcYPe3EwTWLNcxW39nUsJ8wCTqsOYLc5x1soepMwS+MZf8crCq8XrtGZEbI4C06YwQtwnxQqFX4IX8Ln9tCbztPEtK0tHUmnYNYSPxDe/qkqQ4sLb7TTpV3w/VHScDeTpXiQmJZPzFGFcbvB/Su5T3Cj77Y8ytL+hQ/qpw== X-MS-TrafficTypeDiagnostic: AM7PR03MB6532: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jIV4/k+Gvm4s9Ptqxkoh54Q6wGXjBBFVKxuytrsLcvQFG4g1nTrv8gMHqRRId6NyVlPJgzhd1XNFTTAsMgEy1mvY5UVV91Ye5yIh7Q+8hfSJExnyPwrrawvjjeTVZaIPC4HeowYpi0PvcTA6P34Tt+qwHIvxJcLEqLknCNPTlZgUuoGr+veepcVXMuTVkG66/0BGe72Qvd5VbXIjMP/oK/AUIT/z1IOpdc8CCsxrPPkKBLUNiZxdzoTFr4PpUNFb16tCCHjVa4eGtcfnK65JpbK3aDsCWooO3+eGhGbJnVizt9xqe19MUd99VMQ7kBSZl06xzMnwjr8W//mbpJjeajGkc1Ia9ZSSMsUogcwstlNtZ17Eakw0zlv+MMCPVhZIehhb4AcPS91WWlAZ9N2Ludzj5KeUWyby6LH6fbzMamXADoRAZfSjzSmoapiEjBea X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0b4l9UDr0jgj41E2WfYE0zwPRn1M/ioTBJvVaXAoOajou/kPQuNepEVjS1pwSy0lE1HiaD9mhuezjCs3okxBmvGDN0DwHczAuPT4yYXgFdalx3ElfOMY6eSXcygqacPoqtQCkEJ9auwNTAEbVKx2pQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea0cdb75-5569-494b-9270-08d96e282bbc 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:46.3541 (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 05/13] avcodec/vp9: Use av_freep() instead of av_free() 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: ydJ6PdZy+gYN Otherwise the context would be in an inconsistent state if vp9_alloc_entries() failed (and if this would be checked). Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 8eb57eb8e6..8bdcb86625 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -790,7 +790,7 @@ static int decode_frame_header(AVCodecContext *avctx, if (s->td) { for (i = 0; i < s->active_tile_cols; i++) vp9_tile_data_free(&s->td[i]); - av_free(s->td); + av_freep(&s->td); } s->s.h.tiling.tile_cols = 1 << s->s.h.tiling.log2_tile_cols;