From patchwork Thu Aug 12 04:53:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp412039iod; Wed, 11 Aug 2021 21:53:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyChbo7mgt3jlPRyDf9fUaY4xFpqfVoNvZ0ZmEMeyIZ8CfJhtusgj50It3peQCycbQAuExG X-Received: by 2002:aa7:c40a:: with SMTP id j10mr1732449edq.133.1628744034911; Wed, 11 Aug 2021 21:53:54 -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 cm23si1596989edb.514.2021.08.11.21.53.54; Wed, 11 Aug 2021 21:53:54 -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=RrQ8usJ4; 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 84E0A68A408; Thu, 12 Aug 2021 07:53:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55FE9689953 for ; Thu, 12 Aug 2021 07:53:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a263gtyBPUtL/uMMvBmQPeXKWGtr4pLIskLbfj8fnodoVwx/QD2zIZQd4cGrF3/U+u3OQTB8F/V2KnKLi5my2g0BCLupyeQrNssWimXg4Q4J8oVyDUsA8PV7vJ9u2gXNqXGKsWfySS6pFVEB9aHeDM2HZ3toT8z1InRvVyG6hjMJvP+FnNMNU8ZzWqfX8CnvcvxSvwfdKC2SwsVbLhOLIGASPA70Uoetkr0tAVbOGm4FTOHsrPDab3rC02qqfVjjiFHok/hDGZDIfaCyIVzhHhapcWNnhCLAsYO2ZejP8dhgHVZjQ5R2z6iPG8dXzssIRKpWqBJcevnG69lkZbpLJw== 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=dwCyMgUQ3MBxJLROidGfi8YnoWsE1mYJYudIDwRtaaU=; b=fLm6fSt0RK/af4Tb3jHjtrqtaTbDFvpMFvNjXHEKmSAcJVHmy9lkh9fqXD9W9onqH7GxDaesu7oTszSL1HVvNfbM2icCJ/BfuKIOFnMiP1vpSR/NFosffy4k1BRUGgFoQNRbcWUZaEUtxaFLzwRd8aj1VK8V2NPBelqs/yyqgISbBpAzXg2NC2nL9k3yDE/K11YFg9seaXPLD610Nh7bSaJfzDzNSVzV1AxqOtyiPAwOfxNb3dXzaZj6C927hUoYbRO+UIj/rxSzz9ol5wfNYwW0M7bXN6UMvU4M36MF0bx1QMXDC5JLVMAjFqhHklub4WEAIVOzspEpTve7LUaInw== 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=dwCyMgUQ3MBxJLROidGfi8YnoWsE1mYJYudIDwRtaaU=; b=RrQ8usJ4vKgUkME6ugkEmhCj/b8kKBCBLiS+ybl0Fbn/0Fr0KXmLNn0t76eC2MfqzzJS89oHgGSWduss2x2NdA/uYqRd9l62l6uPnhYmQ/f0cS0/NMCNfByQNO+1BhQY0CypcSx2UnyldYJjRl4qApd768CbEI9/4Lf04757nQW8sbD+MIlApjhr/VmeGfp2Z4BrQozVljleqcJxzAc5kbGKMV53m13zF0VMGghA6Z8Qdx873JlGviid/fMQ/0t+1trwMZm3l66CO9+MOWrkyl+mWFpwp2jpjRD9WQLSz8bWlGyOB+PnUkXdACb/ZNog5soQPVMsGHkgmnzek8qzEQ== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4f) by VI1EUR05HT125.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::378) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16; Thu, 12 Aug 2021 04:53:44 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:fc12::52) by VI1EUR05FT012.mail.protection.outlook.com (2a01:111:e400:fc12::304) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Thu, 12 Aug 2021 04:53:44 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:A9A920EA43D61AD06BE4C4C05E26FCBB927058A69679C202665EC6AC6819A2BA; UpperCasedChecksum:F852ED9CE382D5A7EF7E0075B2069292BE23F0C3F89FEC0BB8A0227885BE2752; SizeAsReceived:7160; 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.4415.016; Thu, 12 Aug 2021 04:53:44 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:53:31 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [/JfHXnlAuwZGPE9kGr09nhElTf+pAnK6] X-ClientProxiedBy: AM3PR04CA0150.eurprd04.prod.outlook.com (2603:10a6:207::34) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045331.5020-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM3PR04CA0150.eurprd04.prod.outlook.com (2603:10a6:207::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15 via Frontend Transport; Thu, 12 Aug 2021 04:53:43 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 522bcfd9-ba8c-4b81-c4ad-08d95d4d2984 X-MS-TrafficTypeDiagnostic: VI1EUR05HT125: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gcjt6gLf7+nTWJO4r65WA/pes+dZ3qKQ57foW0GPMl5xwnUAkXe60uSRvFS1QXZ1UTtBCLiuxi1n2c6QJ47jLRNb1s41pgjd105lUvOQRImg37EHsknKAX79tpJOcnlllC2GNTVw7xNnbvtReFO7WoGz4lXNxJVGB5F/ZOFW6sYMEL9MLg+dFOX5OvFHA1RfiAgPg/Ci8/DSFwVxGKTPVA22DB0W3O6pa7BODtOD4rPC8Zc7OeMIXHUKmRiAXPHdV70WuGnUa+1JxI0TmODMvFoMU/FSvtQI5TT+Sjn1nZ8Hm6xriLZ1W5BaFp+NgTQ8MbwzRnY3dyX4cuAFxy/gEPNiLHRqJZsDONjDFBNlA0SizzCR/9B1rPxwFto+HL0wqH1kzVLtmsFQKgQkANeABjG4hATfVc6SIaX8neeq/M9x5bSC8SEJ5IcUhJ1HoBb1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NBkb6Zv6rEPm0hD0kYQikYD3lfb8uaOyWhFSm4CB56/UYoMIivm1DZcDQqJE1DtnwkbONUG65PNWwgkwslZcMrOzUHPv67/F1RT9OGZFY0nz/MIlsRm8hwOvpIhfXO++lIKaknH7063ENeK+RrtCbQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 522bcfd9-ba8c-4b81-c4ad-08d95d4d2984 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:53:44.3213 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT012.eop-eur05.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: VI1EUR05HT125 Subject: [FFmpeg-devel] [PATCH v1 07/10] return value check for init_get_bits in vc1dec.c 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: VVS7gFjP+uSt --- libavcodec/vc1dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 1fb1950ade..07d60294f2 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -444,7 +444,9 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) // the last byte of the extradata is a version number, 1 for the // samples we can decode - init_get_bits(&gb, avctx->extradata, avctx->extradata_size*8); + ret = init_get_bits8(&gb, avctx->extradata, avctx->extradata_size); + if (ret < 0) + return ret; if ((ret = ff_vc1_decode_sequence_header(avctx, v, &gb)) < 0) return ret; @@ -771,7 +773,9 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, } init_get_bits(&s->gb, buf2, buf_size2*8); } else - init_get_bits(&s->gb, buf, buf_size*8); + ret = init_get_bits8(&s->gb, buf, buf_size); + if (ret < 0) + return ret; if (v->res_sprite) { v->new_sprite = !get_bits1(&s->gb);