From patchwork Thu Aug 12 20:53:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp183171iov; Thu, 12 Aug 2021 13:54:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx7Y4vDI8oEK/iteloq7D8XhVqFs+fO0yyxnCkH15RXX240TXYLTLngA94f1ZL1aEvYjTv X-Received: by 2002:a17:907:94c6:: with SMTP id dn6mr5687559ejc.287.1628801666115; Thu, 12 Aug 2021 13:54: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 hr1si4863080ejc.424.2021.08.12.13.54.25; Thu, 12 Aug 2021 13:54: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=C3NqtADe; 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 C16C5680835; Thu, 12 Aug 2021 23:54:21 +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-db8eur05olkn2055.outbound.protection.outlook.com [40.92.89.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBEAA6899E0 for ; Thu, 12 Aug 2021 23:54:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EsjrQEU4L379RDLupv8J2t7+u37LccSTzzodtUkJIgSUyo98zwcYHOdLn8nXfrVQghyo5npgw76dg357tNwto17G0yCrSgY3d3vc4G85KSr9nHc6w/TWKZ006tEGI2N60qHgfr96jqIsEPbwpBnsnNLoOCvOsMyZx3fgLbebt3YAWO+ibEeav/10+8Syuq3OWwRsr0CKXgI6dOVSjbEpCGPYlVzNGrQizTZo3u0XsEtb2HA9JweENMJeuFOiJf1mA4x6R4t3qxztc7mzNCD1/kggJVJ6IEQkGfgz9iMTF1DL64g4J5VHyqdCo5cgJrJZx3B50bfMTiCNSP+Nq7hgjg== 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=Vxk5yujw/qq8FRmCKHph0MmYf/gM2kZw4AkpPlIFgZ0=; b=fR0o18TXovTi6H/iszrlU132lBGbQKqDtqxI+srnGmdJ/M79pgJBwbuPfzRhYNRAb4wvckY+AtjFO9V9mV+yn50jPRzor1D23GRo0w1gRVpGjVhcerhnzOz5/5INSehV+CemSpC7v0rpDj9rbY/vPYWRVxYYvI3LOvdqy3dq+Ar1DK8wOu51+ce+pzEIQyRtgDvxX5XdlLEOKhgWW032twWUuWdMOH8x+nBTZci9WFKiUZNBd97LTeIQvO2fT6MOH+9PKW4afE5PVRSYFIPmUR2o/L+T6ATvMq4shrcIRFN3CYksb+K8ktVhlq4Cv6aYMVtISMR7HN9G5vnhdDlR0g== 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=Vxk5yujw/qq8FRmCKHph0MmYf/gM2kZw4AkpPlIFgZ0=; b=C3NqtADeQxcXhyVE7FfRju7v7GE3om7Hqi8VQ7BRGelOiCM8bRVrucj5pHK++A/7O5nCk9yym+r4SQ8dXO1a5L8gwQXK9Xaj7pKjDIo3iLJG32Ad/uz/OSXqc9f5UBAqqDougMf6BkKWFQhbnAKbglVoeHrvYY9LhOkIDlZaPub+HbW6FGonFX9t6dw2QjBFzwRj+Cab2Uscep/O6rhQYfx04udGXYXN6JWMyz7ei21RgYTbhEOtemgZCkie7VNrWbHU09dqV9G7zRB029PWeFhy6dpFXTSpMlGk87xPhZ54zIcRPNpmYuqpqbJCR3LrCYVVUPc2e2VaQJdECNy7iA== Received: from VI1EUR05FT063.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4d) by VI1EUR05HT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::455) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Thu, 12 Aug 2021 20:54:12 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:fc12::52) by VI1EUR05FT063.mail.protection.outlook.com (2a01:111:e400:fc12::390) 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 20:54:12 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3FC416D20FFF515033B7F7D18C40D912B55021D71F7177D190A73D8DAEBAE41D; UpperCasedChecksum:35B48EA4AAA9A149EC1E35E4E5EB7B68894A7893EB9DF57130A5D8774E6C8601; SizeAsReceived:7180; 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.018; Thu, 12 Aug 2021 20:54:12 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 16:53:57 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [TrfBrc5Qztos3uZHOJ0nEuy3pHRe85g0] X-ClientProxiedBy: AM4P190CA0013.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::23) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812205357.2970-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.239.121.178) by AM4P190CA0013.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::23) 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 20:54:11 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 83812933-6151-415d-518b-08d95dd35643 X-MS-TrafficTypeDiagnostic: VI1EUR05HT045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kW0kPQ47eQneyc3PoQ1urjPKKIV0g9R1xWMvrCF40loR4mDJGN+JpgxSJaq6zZ4NE0NC2Y0//DlcNsn3KESVprat0twBsQX5+rqtO+3tfMQCAKI5/HOmkRnjSdpTSDLOApm38pb752QEy8S9B03UdzNvl/HpbxgSaCVBlciAQiiOIRXC0ittq8vHlOL/vnq+W7GLu2J7cydxiYIxBWHLLtS1guZQeAdv5XehD4FHzcJ5/WW0zpAVu6l65Xo8qzgYLuAqEI4ihJoE5HboW+d7RhCDY08G6weQBB2AIol8cszVTBI1H0as+B6XiDJAgiHKJnDWwwZwH++iUhS+MHLlQeJzYSkQ+seE/3siEPToTcvm+A1MqWhJo95twfbcJEV2TiFyZTGCb9Pc85ATzq90GSsRTo9W/XDahYY1V2u6GGY/GSFvwUt9rPZ5eQV2nkvl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vvj8p97/QSkhq3e8tJpaihGZMIpbcaLgC6ArgDJaqwq3HvLZ7D/+snHRcoRtcbE0KPjf+ZJ0H22oyfWBfeea/nagqADPQ4+Mk1xLBgCzEkGe49/MQIGyoJQx1zXy0etaihPybHzdAmW2dEHK5j2FIw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83812933-6151-415d-518b-08d95dd35643 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 20:54:12.1667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT063.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: VI1EUR05HT045 Subject: [FFmpeg-devel] [PATCH v2 1/1] 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: W42tEV5D5bos --- libavcodec/vc1dec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 1fb1950ade..bc76a07ca6 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; @@ -770,8 +772,11 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, buf_size2 = vc1_unescape_buffer(buf, buf_size, buf2); } init_get_bits(&s->gb, buf2, buf_size2*8); - } else - init_get_bits(&s->gb, buf, buf_size*8); + } else{ + 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);