From patchwork Mon Aug 23 18:35:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29744 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2326062iov; Mon, 23 Aug 2021 11:35:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6MWfTO7HTxZgGnOGOUNQSk4ojlIOfJ9JtKCAa0jtuhA/qMvsJM7PMpoF13lZMZL4VUJQT X-Received: by 2002:a17:907:969f:: with SMTP id hd31mr14845915ejc.475.1629743726521; Mon, 23 Aug 2021 11:35:26 -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 ka17si16302986ejc.609.2021.08.23.11.35.26; Mon, 23 Aug 2021 11:35:26 -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=jYrIwUCj; 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 C7F32689B0B; Mon, 23 Aug 2021 21:35:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074052.outbound.protection.outlook.com [40.92.74.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 301FE680A42 for ; Mon, 23 Aug 2021 21:35:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EHXEqoQyAdey3xiPPkHmkToR2+86zbcFUolluCMoQnafs2Tt/T7dfarJAbX0fqzTTYoa0rrcIS6cVnfi3t4YudvGjisJR4hYPdBSYQBzle8h5i3H84bT6EkdKUGebZa7170+T0E74VXxtDy2hqNNZz8MSRDtm5qer74xYIMfJB1E0tE6diq2HyHJQ81VsfGjJbzHBK8D2kdykpR4xgKSvB649O2UFvT5HNYEyL4GrVR/74fwjkKppYWnIcK1Y+3NkBjxb7dK/EWD3BmRrBzMDnrS6RxVbU2mRsj5neeqtkdnN9aqx6K9LOXnkavSVnh3rBLVt/CxXT1a35tAK/bG4Q== 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=pMH94+WdQiHMh37nu977sWA3p1+wAQPpK6CBnbxoMg4=; b=YxOuUCKL6gTU9dE7IgYHD9Z4m6KcuP0ptu0sPPUPxswHOe9YWj/TX51zTh3UCBpiFBjf0o5dafr0cxiZFrZQ0U1TwOP22Iiyku+/meI/llapsMfLb2eg6nzNid8gLYTufk9N3CurGomH9QKyKjvxLXqmyBIaOoXVidgDTIUKEhmF8m/1zKpYNGxhkyszdUtwZ8zkSi4XSuY593DYNXzxdyPrDSN23R5Yd3A5DfQUsixMQogP9nSbWx4thAXYZ4+sGV0+DkrI9NbJuHJx+Yv4WeP6Wob+KOYBlt+u+aUlg6SVP2aiJYkrafCYAPU5FIQ1jPGAogCcyRXpdCosVL+bqg== 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=pMH94+WdQiHMh37nu977sWA3p1+wAQPpK6CBnbxoMg4=; b=jYrIwUCj2BpzWcZ00mtkP9C0sUO3U0a+aq0jnMrFntNgRLNPQYcnxEfkVj5erotQ5ghgRNPaXFvpb1pEK64NA/P8nyUexqwKuD3WSSEmkEeaiWS5ik7qw7sMYAal5SR66vCSYxJ1JDpaF+NlwLs8RM3UtbUStJFz9v8758zDMltWIZgQpCiPDuLQEsW8gBN2CkF3TM88hb/obgZ2XRWfD+zdsCAvz4Ih4/4lFcDZxdhrAOR07q5B0hFXEcpns6X3mKvLF0YLjNUJ/5HNYKqR3Pff9z839r6Ww8yK3QKey6DB1RZUuq/Sp2ggt+0UdQWK8oKHqFrWAqbmrzx6O7YI8g== Received: from VI1EUR04FT041.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::47) by VI1EUR04HT199.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::381) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Mon, 23 Aug 2021 18:35:14 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e0e::4a) by VI1EUR04FT041.mail.protection.outlook.com (2a01:111:e400:7e0e::346) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 18:35:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CBC2CBC1DD179081E85077CD4D53DFF79CC584F2C320CA48ED35D72318A76A05; UpperCasedChecksum:0717502ECF72F5C6DF079BC808B08DAFC7890844EE361D363B2D7C563AEB7656; SizeAsReceived:7167; Count:43 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::b1f9:e0a6:6946:9c81]) by PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::b1f9:e0a6:6946:9c81%2]) with mapi id 15.20.4436.024; Mon, 23 Aug 2021 18:35:14 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Aug 2021 14:35:01 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [6ab6YiniHO04WYDT3QhbrFHmupRQYQhs] X-ClientProxiedBy: FR0P281CA0086.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::22) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210823183501.2797-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2.191.135.98) by FR0P281CA0086.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.5 via Frontend Transport; Mon, 23 Aug 2021 18:35:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 78384a64-5d0c-41a1-ff28-08d96664bf44 X-MS-TrafficTypeDiagnostic: VI1EUR04HT199: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KAwpDww3iP8hvjarnRLcu2DgNSmzmoMv4bglkhmpLvMTE+s6D1Mjm+3nyhwDfPW+QuUmnmcFU/rD9t3f7sBKEtVHBeXWaClZc1wVfGf3rFf6C5Sz5L/KwY5Ij/8Naxp59++KZB0jLfmvFQn1gZ0yn2x1yxnsm8PeJPgrUzbQiA/9t8O8qnYGWktK5koPc+hzQqrogkh+TrBDBQQBxISju+AOyj518kfYafqBqP4aJB0hhBnN3dODRhUFeFSStFrfIYxUi4UkX1AIhO4M7rqY76aPOfxB8k4vp+JGtEvURBzIyQmpZtf3nQpmfHtSua98B1S+g4eaX+Szj2f81RopZrQdBBcolud1FIsMjbY1LOcMX3dvmsOL2hMrnpSO9Ac6EnfVhINfEQikzZwi5J3oQu6y7LmsE9gCIXUnx9VT+qEEibq7oTt+uC9sNumghQAv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 61kIv20L9utVpE5/db7MHMvBckADEcFtj5nmWCGMjWibng3T97gga4sO0ZKHPNjIZzfh6wgvFZrqFfU1GZCOwq6SELVlkwAwTy+aMpaRoryipQ9L15Qc1Pm6y0RMxn576kYSvVBdr/+ePNkvN+/9Jw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78384a64-5d0c-41a1-ff28-08d96664bf44 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 18:35:14.4594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT041.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT199 Subject: [FFmpeg-devel] [PATCH v3 1/1] avcodec/vp6: return value check for init_get_bits 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YjkGanifySyj avcodec/vp6: Return value check for init_get_bits As the second argument for init_get_bits(buf) can be crafted, a return value check for this function call is necessary. Also replace init_get_bits with init_get_bits8. --- libavcodec/vp6.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 73822a00f9..d024370793 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -167,7 +167,9 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) } if (s->use_huffman) { s->parse_coeff = vp6_parse_coeff_huffman; - init_get_bits(&s->gb, buf, buf_size<<3); + ret = init_get_bits8(&s->gb, buf, buf_size); + if (ret < 0) + return ret; } else { ret = ff_vp56_init_range_decoder(&s->cc, buf, buf_size); if (ret < 0)