From patchwork Tue Jul 12 10:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1909092pzb; Tue, 12 Jul 2022 03:28:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v3o3qJ7qwMcjjEoNOH1uUlVxaNvkoHleJCwLLDyXZf//Dk1cDUyrZN6P9RQ47nJxs4ylm+ X-Received: by 2002:a17:906:9beb:b0:72b:4a68:ffdf with SMTP id de43-20020a1709069beb00b0072b4a68ffdfmr12925135ejc.21.1657621709055; Tue, 12 Jul 2022 03:28:29 -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 gw11-20020a170906f14b00b0072af2bb7c91si12117739ejb.139.2022.07.12.03.28.26; Tue, 12 Jul 2022 03:28:29 -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=MDhCbyS4; 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 A936168B5C5; Tue, 12 Jul 2022 13:28:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068085.outbound.protection.outlook.com [40.92.68.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7130D68B5C5 for ; Tue, 12 Jul 2022 13:28:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bwYAy4DQXW59bVGUZF1MCkSIsAU1uNsuEBKG4Gu5Zgw/Ao6tgsh1aSz9yMZhQDhvfLhLyQtbC1XRe7uKveK7jyQjjP5Im8/cdpUF1bFpByfrHUcKThjfj+287S+8CLy8MGe1wqWIsZrQzYDM/VpHTdycq3e3iXuo4OB1+EfJX0gUWNxtJZ3grA0L3VZkvFR92zm6fIWA0nxLeNAr9bIdQQEbT7E12AGE4zV78HRUP9DFLuWcQISBT9mv/ujFD7d7rLf/1YLDwH62gj0ocAUpND6YxXglUw8Y0743WCCiTSFxSc4lNu6H3XElLDIth/SYCoVGHnlwXPIsCowj2ND+7A== 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=J+mTQWXePVD11eUOGpwUCtN1B8OVgoQytNrFmoY+m6Y=; b=LSkW6Fnh4AqbukmOYC5Plvutdiu3HdJxehgk2ndcdihDojOJiFe7BCSZjyuOiqLz9949oeyO8aHqP7gCn4wuccBvLGhf2DTVS8hDCGMFPclP6jjjgZy4tEtv2EnEn1AXXLKJqA/4WTzoPqbxQMqFEKm3NQxg5nWYfAo0KD8bk/mSt6GW4oBM3YtOZfMIUt1VG0PK64V66annaGytZhIqRUs+xuTgix4Hz7nT+jiQnTM5NfVL5J5WzG9LW/BIkhUTU7pITI81UU75xmD9zfQZ2zJFAwwZWjHxkJjqk1koprP/pT2WgIIVmge8fN1sWb2xL9m07iK6XXimqM/jgfyLvw== 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=J+mTQWXePVD11eUOGpwUCtN1B8OVgoQytNrFmoY+m6Y=; b=MDhCbyS4duUu1UlN3PQWsfLetqk4Bl3IKz/USVGirwSPAvuPdz30tVkzZv9DjIAognwkxGpAMdg2ThOI+gzM0/qUgIpPd7O9d2F+rj2VGHo+HKSh1+/w3bVU4y7443iqwV6UjLd1BhFEGIe09HyFxjhPvxFAgFlCmInCbuabI9ilc7W55xK7jq5eTXQe1AS9QB28x5k2/KSTcufKR1D79K/LzqRL8Xz5gTH523864+0Zly3LaycJTWExy8rUvZoJI4S74zUPLOouQdd8KbW+01YJXRIxVvJEcFe57DjVNNcr6SJZXdgmqtfaEtlo95sy0bVFAbD4+y+vHyZXPousdQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB9934.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4f4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Tue, 12 Jul 2022 10:28:17 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Tue, 12 Jul 2022 10:28:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Jul 2022 12:27:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [6MyKWXqh2Ljsl9hXEOWXIkyOHuhx4ILB] X-ClientProxiedBy: AS9PR07CA0048.eurprd07.prod.outlook.com (2603:10a6:20b:46b::15) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220712102751.3784996-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6591c610-7d9f-45e1-89ad-08da63f13bf7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRJ0BC0M7R52QM1cuRSG6d3EhJ1M2gg3/nzqfGy9tdNyP/xRfZzTjZx/WeqFr2ly2e83rmZkkKepjiH7t0gErATlrCm59OUWnZwg75th9xbjYTr4bIxVYi+CqNqbO5RAsHauMLOHtEs7pN3vKY1R8g43dsnpbzCQbxxxeOHtH7aFDciwEuuNvv7F4GeJlW25xLzAQzuH2pLOmZRYiVrntVdE3b1l0DOlLkkgSjgpdylYEvBGlx3s1gvaXHrM8jRf1LdKHdjthKHVVEF0FmayNWv5VJA0eFyP97HOD8MJbrT57iuslqeRKltgYC2VUvV4t3+KKGERmyH39UIU+CDvinTT3lxBQ2AFLkR5yNl4r1htkKBUJO1PsXOLwa/1Knanl1/tuq1p/in8WXye/bBlL6VmgFPOYkwtuJxvg8vRGzX5UHrXvcJqSNeh/TWk2D01/1myY9GP8ynNtDTcQEaBE1mH4Lf6jmQDH92wWKLegZDtX4djlUNKpSLBfHRzxVVujoOsO37ObIPhtR3e4qraLguEBDg//oWGIrtRdD7wKrYYkD/d7wAi5PIllE44ogyqRt0vc8/c+Lfc65w8f+FCPsV7CbADazasmVNG5eDHJV9DkWnSMsOyqRZfx6F7lHlKaKrF0WhK+4+wLpZgJr9MVty7ne6le+eBRb2zqxzgMUW+6l2jT7mL3HSjOgXbEsAA+VAk5qlsZPT2ysXtAAKFqvhQ0lTZtGk8XGYvCWgDIutfQP/at2Ng94Y5vVvStnU2Bo= X-MS-TrafficTypeDiagnostic: AS4PR01MB9934:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7s+HmhkZFZA3mXL/KWWiKxlPC2pGu10DARJk4tHJWs3I9Gzz+1fll0OJyeztf2Hb4boEJft+3+Cw6PFb1PPwGW24+cvtyX8YNG2TjEYHZ5t4l0mSNeJtsJCigfg4/trenHFy0X58Qfr0S/zY7inB3mEDLQVx59/Yho3vRACNOJTwa9tFm/ae3DN+mWVQ5Hpf2W4VkT5SS36DiVap77q7vO3QxqCHx/74zc10Rz8sGO+/bjp6gtkGVK8KNrU/JBk4GbkUD09d6yToZomiutfTCUfJVu3hnTCM8onmT1H+4brQ7lbT8w2QqRojJQOs9TTFRWi2zjNqQLWWpnZrdaLV8QOy4Gg0uFvAzJfAJOI0pP1K7GOf6U5J3AKH83AnCaw4jayQC4Ej2PuX4ZZ/w0WN7otqeAA6oOJTCxGwPLALXt23bfDXrNRmct+M0SAoRn/Qnzlip5yfUBQc2OkrMl2qU0ilhEEQfIylSLrigW8ACmimuv/8q2lc0L2wNH+kr5M65LEcK5C9bzA0XLk09hr6fwLkLpPc63foWEw09tAr9B8CGi28An07AqpDxWxspRiZaUEu977NvnrZpkPkabdiE4MpYZZ8YILd1UlWnFARqQDbe2dYA7/WDZWNfvrM0TxEOpOPeVZPW830kKBz6Cc6pn301MawBEowCDBJs5kdevttKgzWBq/+hCB6dub/GKJTM4lya9OAHgmv9ecu5CQO0w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cIBLvUYVKDnbuMalcXVuVjHQMYktNUQNH8Bes849oZBYzAwY83ZOw9UfdzDiDKTx4mn4XkaHsF5V+0aUA1Ldnh801l4ob1p5SCsjtTY/5fTu8rkXhQrV677h8jJ1tgyYphzhwoLjvc2wcHHL43KMjN95ARG7z7smWKa6dR4r30yl01ztf9YTKFWzs+DKWJVhU860fS8lU//jGhiwKtGqPsLreEgfiuYl2CpFmYjKSbpVB8wO2kzUuhA73UgK+iL5g8HSA+Ac84z0ymxy/BrE728kMd+zr0LGTP9vUxa0BE+Za6L5acijAVUlbrudWRfxS9SzCzPkR7BDI9sdNJylB9iJyCm+n+GnMVSyg21koe6YItARsAVm7MQlFKgRvpixwgNUklEnI1BHUwLv7kQYWsSqbpzw8DV5DyxCPt8ZD+hfyQXD2VYMg9lAoXL+FD8Z61fVqsvW3IEEAcN9RmMsP7049XSnDIM+X/FdXodomhRo3OehCnazRfBfBDyc7H5soMIUwbsj0C3R9UPdJ2Iinmp3meLTdYYObytw645PNc4uJd9iHleBgnarsLgBGhc16iTLfqlEy26qUEVNdnHHCMRCrWd1BLt3VHQBEGL1Cmt2S8aZT+pR9Mh3sRemAEbEr+bR6S8dd1BnPFPFIHlJpFA/HnFOHN4N6A59dZORc1kvBjNnJub4ImQ51UnKjmr3QGZ3nugXCgNIbffgul4GWD1N57InL6KYZf+4G2Jv70+IOkbo9y2BT7m+8R5m8H3uG6zwfcIehEoHlZzg5JYUjGXBKPCTPSzxITf3TriqIsFbQLAsk8MxTZL5PzB7G6o7t8XxU17esTUYYylDilkwk+yo0X/7cVlRuk58TeqlaoUl5YvW0IIPruHnlc/wLytMqgQoJBfCa2dRqgYLbe6tAwEmiISqCKQ3J60Fh+KQO89tEJeYiMrLpwOA8IRRDE/KCtURIEnWTK7P0dwg4fpEqdN68d2E7As0kzzxRFqIIt2EHKwkym75wRMPG+x7iSsxudpkzqSIBZZqC3jF4aVUeRJ1kCk7cpL0Pk3oobe6h1nBFS9so++YRmEuMaf02oh2NSU8zvjRCVVlKUNDgDj1lGiJ4fe1g+r4HUWDoXnrwddiLjxjBEVNenfdx+uPKLif40wibbuU3KqfyVKBb/ZJ6RaVLaOkm77kjE4Uldy9N9VMJvnBO8VqxQ0Gdprx5uoq5nE0agFmNwYAw1r++xFGy9zmodtex40D6N2/oiph8WUBNEQ8UfSyCGjS09nsKFwmRGQdc2rgbZ8I1zlHgwuI85hCppZhUtjA8AKQIHSEEBM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6591c610-7d9f-45e1-89ad-08da63f13bf7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2022 10:28:17.3505 (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: AS4PR01MB9934 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/iff: Return early when possible 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: k+/lhR6BycRa It allows to save one level of indentation. Signed-off-by: Andreas Rheinhardt --- libavcodec/iff.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index f14644471b..13912e9133 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -223,7 +223,9 @@ static int extract_header(AVCodecContext *const avctx) return AVERROR_INVALIDDATA; } - if (buf_size >= 41) { + if (buf_size < 41) + return 0; + s->compression = bytestream_get_byte(&buf); s->bpp = bytestream_get_byte(&buf); s->ham = bytestream_get_byte(&buf); @@ -316,7 +318,6 @@ static int extract_header(AVCodecContext *const avctx) s->ham_palbuf[(1 << s->bpp) + i] = s->ham_palbuf[i] | 0xFF000000; } } - } return 0; } @@ -1470,10 +1471,12 @@ static int parse_packet_header(AVCodecContext *const avctx, IffContext *s = avctx->priv_data; int i; - if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) { uint32_t chunk_id; uint64_t data_size; + if (avctx->codec_tag != MKTAG('A', 'N', 'I', 'M')) + return 0; + bytestream2_skip(gb, 4); while (bytestream2_get_bytes_left(gb) >= 1) { chunk_id = bytestream2_get_le32(gb); @@ -1517,7 +1520,6 @@ static int parse_packet_header(AVCodecContext *const avctx, bytestream2_skip(gb, data_size + (data_size&1)); } } - } return 0; }