From patchwork Mon Jul 31 11:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba09:b0:130:ccc6:6c4b with SMTP id fa9csp51573pzb; Mon, 31 Jul 2023 04:45:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlE9SF4om2zogVX30FiaFdXfk78yytmnplr0CshGiD82cRRaw0xTC9dK+Fhe052rIvZdOAw5 X-Received: by 2002:a05:6402:64a:b0:50b:c630:a956 with SMTP id u10-20020a056402064a00b0050bc630a956mr8354069edx.17.1690803907441; Mon, 31 Jul 2023 04:45:07 -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 i9-20020aa7c9c9000000b00522c1f3b1e1si1596545edt.259.2023.07.31.04.45.07; Mon, 31 Jul 2023 04:45:07 -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=H4UBDOfR; 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 AB52768C5BF; Mon, 31 Jul 2023 14:45:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2090.outbound.protection.outlook.com [40.92.89.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94C3B68C430 for ; Mon, 31 Jul 2023 14:44:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SlRmoKI2NjVSGdm/BIOadgwUz7NSc/zPLHxncqCy7df8cjeu+ae8TbQ4FUWpQsyyuxosJV2Ccmurd5Mzc21n/GkV9iAduMUXIuKJS85YDnrRaDfD0uVm+zcatZxPdF+/8J+aqQppQJ3gHTnDjSoGFXFKMYIIlSZ7M5erSZxXuVDb+rYxUihax1Urv/Y+j7aN+PtS0cKb7PxNGNFAHpBRCHyd1FE40d6hteZkUVChj6EoG2vEIXMO1UiI07YJnOvEZu+/SmOKeuqQDqS+psHmi+eV0yAG3SU2KKDukML8sccbiEISnqQotobNOccQ0M7TyxJbbscktNpWTm3LXS16eA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YVOnEaKBZrHDXGh+NOcyPAGjkENb1PHUjGaX9E2ov6g=; b=mkWMz+v+PuEtKmg3e+C0be0gaB7SlLwVvjGW6Fan4nixbPQ8q1IMhm3pS8aMjHrxFw9FIX8wUi+Jyq5bDoHzUj2V79KFwnbWgvx7y+KeTSseLNVect25juSXHJQb2WvcF9FcI6IDojOyaUlHimxStg9+0uvcZMd3IG36ONEppzxAI+Pv/Ca3ME6H4dNlpboKGKwJEuzTlxmskBTaxbuqQXjHTRrIwFR+BKucNyWsF/F8MJJFgzTVfNkXtRL/hahp7prp8ZbOMotmxfV8L5ged0670HFjzp7+Czp4mgI/6/sCDF+35CqTWC19BXcb8Lx6dHrpXSbeHv5hTtatRUsCQg== 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=YVOnEaKBZrHDXGh+NOcyPAGjkENb1PHUjGaX9E2ov6g=; b=H4UBDOfRrNx0fGcvTwJ2zcLOszv0AOkQnGZeJ0EQ7qdVernaPv6Rbk5wIgf8nGrtDevqmjQvknWhywO/DODWgmc96Nv28iqqqWj1tVpxWEb4ap/g/rX+JiinYP447xU2EC/U2ttLe5PMo/bl4imPQp8MzFLsu6ES8IFFLxavcQq1OQNIFJwvRYKkXGMKT34uojK0IFQiwSBrL1vNxf2I2YZU35FsEKJnEhe8ZYHII2p3Jx8Rp6d+iJdI478qEflRt/2FhQfH1crxGTWauUn341p2+CQnJHkscGG01faRsmQbAqo+aD7EUfNDWiWjOLHzq24SLMMDfhmNtDrV5SjxYA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0195.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Mon, 31 Jul 2023 11:12:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.042; Mon, 31 Jul 2023 11:12:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2023 13:13:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KkaVrCCfUsz0daKnbSPO7bO78Ki+Z6jTN4vQ2Ces1QA=] X-ClientProxiedBy: ZR0P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230731111335.3313288-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0195:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f3f7d8e-2e2e-4a4d-c943-08db91b70fe6 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqJuwtH5CpNudvoJXR8nEMbWeYAsVKQhKYocX8f4f5+0yArgtSwKSBR+tYmA52J9IKE3i2KXEbPs0KRHLdE+FKWrjTOxPuvd31xXIEnZlARvPFs6/9YftarNscmCqslwi15tKSl1SqDZAbtu/j/uHcKP5FEwpHnSp7uDwcMh6cni0QSGp+rxi4AZn5HJb3gBSovHemrBAZowS++x+S3IaOWP4ZsHEwZBaWZHtSwOX6agxsBJHYLFdPjevEZPTp6ImOHDFqAWPiwTIyJ2CDTJCwCmGXBvs1LXIOlwf6YuFsbwsYKGz0KGEowzNv/QtsZ6UYHmcStn8TzpzJN7QJTD4W5Xuu/mlv6AzxIE5t82tVJGOqymnFfBf4lc+9hnHLJJUSAU0zWc1iIv+Yd6eOywM66Gkhh4hw0r+OkX5h+pVqT3ST9cevpBDNwMc9NH1o7tmzOyr+YHTmbia2zLTDqBKeL+iEWaBISlHuKL/ds0A2MmwDAvP+evHexTl/a6sIumsls1EHO1XLGFro37BNnFLLGOu6zU+8Awfv1bN3ckYITamEtCKpFE8S+dVqdg/Nbe+fPostVLfN6ODqGSCgLd4RrQyrduAX+MuY5Si9JM886gbHbRzS1+0M5ZOKsA0xbfaXbcgkBgLkLzIAL+hkrupkNiVGSYvICmGmJMWrupyAhvDF+EZdCnH7sZRfHl7Q8BmB/d+ipJdOePbr3BUNt8GHfaFut3FJ+8F0D6j2O3pW5AOukHeM9VDkWdkmDa9i/EPE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wYMaxJOHVw2ko5+20kRjkF2kW902Nb3sCyxU68ZlepZFCqMKxYOedpbmPG0xdlSUYy6C9ORypLeQK+pLZlh5iVLWdGDvPEBozNvstWLPQDHbVFmE9l9kpDQMMTiMHl2zlSyrbzGFFsDh81XNgA8Wh7iraMOzbM2AK3hgsfhAgYK1DBaVvvRT5LIQZGoMeIRlnJtfFlU65cfGDRbeEcV5hVSczVxt+5AuyGtA2pApI32zANb7YanFoLH8Gt1qKUVQmDtDXqxkkZBGEmhnkxYR70v6QECgEFFwT3cloNstRIv/wr8iWha16YlXMgvoLnTpy1EcGRXiYQQIGOuJuk+wXk8epgJ8pRGoe9vy+SA4IRJXR7CNO1ipYVqp1HKn5VqPPidFKNz5OMxYH1Sp3lSbTJ5OQajVjDIbhz55n41pZkSn6D9ZLTFVRbFO+hjDFqwTg2UpL3kFWWS3B9oWwmx6xlq/wbK5Uz8HG+qKbgNeEMo3aO9kAoNd1bFvPpABcx6HS+CgCHK2vEoDaulpAsLSEkPHiCWLfwGR/Zwi+0iE0p+8IuyEpL2ZzvngX5TV5tz5iCZIO6+9plY1CruIZfxRRigPFZZ802pvIGDsaQ0zknQ9eea86VkRnxCgZqTdynah X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uty7DPZAkVNrRolNgAcgSviXDOz7x6/PHZAybIXsDl8dX9L3jbyjrhRKiUPWsidOaelJMTKQjLBIa6SMVG0f4NQiGebkloezL/YlNxU77q2snPHkPwkGEGlxAzlL3JqfPuTxPI0AEyFhfoKiy8saCiug7oOP51CL4o7ZrlvruB3zKm3go1oK7d4Y9Y20c8iCBIHSzT5vrHCkI88LCtiGDC7dx3F9InZ7dXywOH/QhmggAHlVIAxN46LfWFJG3bFYi7RPgf2wKq1X4HdVDuV6TgzxBUueMFNutfnn4Vem2hAdMkqdhmXIn6bIFppK48eWLe6aix9IA7iA6Htd9FuDOm2mBGwQhk+3a4QwqTDuUUpq2m8LYt0nqRtovLM4AliP2BRhQyQXM2OWdT0FiOLp87sszXtHqgWQ/BcCRKh5ECki5Qj9hD1FQVGb5g8dKEKcMmIN6oS+2QDpd9S0e1+xxT1g7fmv8wnWx7Oru+l6SmobFa/TJ0YpcfraMr4StD6x66M0ZhYeW+WIsodEYd3IKP7pPyd5kkXTDM2Cj5xO5tfmGHG90YrJTJH78xDBODa0cokR0xA3nXPdDqyVICIzSufx6J+dZ8vsalzSXjxrWyYXK1cRtzwXQCxd4kJJLlhDSYt5m6MG3xpRQnC3neXCpdaWIA7ogEkNRBUUgQrzYcTTnAtJjAxlShpqixOZf0TwChj/AU+avc8zwfGgQ9BahvFgRVFr8pPxLDJaDW8GqLx55LAxt+/xl2EnIyTq5/FCzSSC57F0+wnuWZteN5PnM4Yz1anCN7dXLGSrs/qoN0wleZXlgc9iaO8HSxLNZG8KtEAQJhid459akEoQWJoG630PbPZ0SmbcK3JPLCn6mdEl8bUfWl6Zk0UIp3Ay0LD2osH+XOr1cc3/rPBk6Ax1kjjiFfUX68ARxvG1pCCX+s2zVGu0u3qqctcmHtb79f9y/eoICHGFFF0uLXkuzSge39MsllBEw7r4DmCCJBCFs+NCCCWle3CJaIGPZjZDqvuIhgXdRB9HkmNh+jv+9SMxrtLaiplgnv0v9+EXuqijuajIydLjwPw06RcW6bVjkAllihdrsqXrseUlKMwuEcEnp5U/XPs5nLzy0kbMTxS+qgaBuEsWMuVCQNUMnHNhkmdSrE110eQcuA5rNvCcjl0QnO9Iv+c1K9ucGIA7kagKeYUaPOAvWuQrbBI+M90jcU28i4mFwFIw2/Tm6GjuwJnd6pVqiIEjA2bM58SBudlElELkKijBBt6PCw3AsU8xkpYn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f3f7d8e-2e2e-4a4d-c943-08db91b70fe6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2023 11:12:43.7093 (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: PR3P250MB0195 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/mpegvideo_dec: Use av_fast_padded_malloc where appropriate 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: LskaCqr0YCAQ Will probably also fix Coverity issue #1473529. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 670b0912e2..16e8b9193a 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -154,21 +154,16 @@ do {\ s->divx_packed = s1->divx_packed; if (s1->bitstream_buffer) { - if (s1->bitstream_buffer_size + - AV_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size) { - av_fast_malloc(&s->bitstream_buffer, - &s->allocated_bitstream_buffer_size, - s1->allocated_bitstream_buffer_size); - if (!s->bitstream_buffer) { - s->bitstream_buffer_size = 0; - return AVERROR(ENOMEM); - } + av_fast_padded_malloc(&s->bitstream_buffer, + &s->allocated_bitstream_buffer_size, + s1->bitstream_buffer_size); + if (!s->bitstream_buffer) { + s->bitstream_buffer_size = 0; + return AVERROR(ENOMEM); } s->bitstream_buffer_size = s1->bitstream_buffer_size; memcpy(s->bitstream_buffer, s1->bitstream_buffer, s1->bitstream_buffer_size); - memset(s->bitstream_buffer + s->bitstream_buffer_size, 0, - AV_INPUT_BUFFER_PADDING_SIZE); } // linesize-dependent scratch buffer allocation