From patchwork Sun Aug 15 11:16:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29533 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1146446iov; Sun, 15 Aug 2021 04:16:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDBQLKcnqpQXz50/SMCDuP/4Ac7zazZK3NRAM7/+bhSNZbIgO8CqGU4x6+zFi8qVWkt/kW X-Received: by 2002:aa7:c3d0:: with SMTP id l16mr13791757edr.122.1629026183987; Sun, 15 Aug 2021 04:16:23 -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 f14si6764363ejj.667.2021.08.15.04.16.23; Sun, 15 Aug 2021 04:16:23 -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=I76rcTkg; 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 C23FA68A1AB; Sun, 15 Aug 2021 14:16:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2023.outbound.protection.outlook.com [40.92.17.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE494689D1F for ; Sun, 15 Aug 2021 14:16:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F/tDUvtBN6UJsSaOGBH/ukQe9+yK4Hio2OZWervzMseFUS+UY89WV6VRol58OX6tSbhiOVoETnEgXEWgl5G6es1oKSJK22UFIbPFfog0WTGxzd3JlFnDR2B35HL7qMVvZ+ZZFCneEhTxo/nbZngo4qnFrR40bRPDEn4jL6QSMTxyeNqxbHSlYgh8OuJ1lrUh4/CMP6su4jg9N+Vuh/mGWeuESr9K6K+zGPnPA8sQsxTVgyUp5IBC2kSlpXcvfzWgJFybO80fyevVz0I9lbgnMOqfn39P2S0e4st73k9c8DuBO2ckRtjKlIhm7Rq0LkQyreKSCCh13HLGf4IAbFGv1g== 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=bw9jnJKoQY1tp+5X7iE7v9PlT69Vo2kktV6BSdAeEE0=; b=T6/xQNImWuwBkT93pNG985FYjmKF4PbRMhSQF67Q0uzyRP3Adb+c7pCOGBjyCV7bx+bMooX7dP/u8x1ca/Nx2qMsessQnEvf/nUuSgchs8H+m028BnT4l1tL+/KiQSgFA8U2wg1UYSgmhNdqBfz8dNQwKCch3XkfCJNDZLeRN3Um7iEzsMJ6zBbWMCVtTFOR2tkm9TkmaiEYdhPS+tUNWnLDG1cI/t23JC/8xAwALgJm2W9ESvHnXlGCow1qPYQJeRuBQQsuQijuCInhJJf39GWFs743dO9xaYpwPpbISPDx1E35cuVF6lNUJ2dE3QAIeUs9DwTg9M04ZznCWjalmA== 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=bw9jnJKoQY1tp+5X7iE7v9PlT69Vo2kktV6BSdAeEE0=; b=I76rcTkg08v/tvkfn280TNTkkclHd2emp698Mt/fynahJYug3y6crZnJZ560ODeYdYRxHYXXDxe8Pa0Wg58pFAU/K+fz5pjlVHTpqzU+EjEB8HVvOkGBULhjmcIpVC5Gl5TP2eoBAir2RsnwRgmDXah9KCQwSnAVJq8nJBJ9GI1N0BjJjy8jUK1qXiZH78p4qQeqp/1dxkLZHDE45yQa++ZihJ1z9+ZvMWOQe2422azpD8AYB7BgYnENBu3ZSn4Dsujhm5TyfbnpfyLFuu1z0SBVCHqyXc655x3Hg8YYlI+cGKj454ZUyj45emnvjsZr/J8IO9Lgrh34YSnlVrSS6g== Received: from VI1EUR06FT057.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::51) by VI1EUR06HT137.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Sun, 15 Aug 2021 11:16:12 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:fc37::4a) by VI1EUR06FT057.mail.protection.outlook.com (2a01:111:e400:fc37::165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Sun, 15 Aug 2021 11:16:12 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:031EBFA2027CC68A068381CFE7C85DC0855C578CD0AFAF160628AEECAFE57BC2; UpperCasedChecksum:4322591720A208371B51A39ADC5AF70871B93FD8446FD4B41894D53C6D5ECE4E; SizeAsReceived:7289; Count:45 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.022; Sun, 15 Aug 2021 11:16:12 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Aug 2021 07:16:00 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: <24f0eae7-ddfa-4e07-3775-08d95fc5820c> References: <24f0eae7-ddfa-4e07-3775-08d95fc5820c> X-TMN: [azNYS0EJv8CLV/rPTu1M+w0K1ER6vL0J] X-ClientProxiedBy: AM9P195CA0006.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::11) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210815111600.2980-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.239.115.203) by AM9P195CA0006.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.18 via Frontend Transport; Sun, 15 Aug 2021 11:16:11 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 68f1c86d-bf0b-4fa5-0fa2-08d95fde1709 X-MS-TrafficTypeDiagnostic: VI1EUR06HT137: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6NzeDVr1JH/8hcIVV5bbEZNiKy1tBiCGpG87exx1gLg8PIFqn/c88QjdNPx8n02WVmwukDT/FLOfi1YYNpml1OLkos79zFowP2ra8OQHxzTDktKUNz/xR2MDhb1G13CXAHASwtwGnsyyCbip6EXdEWqw+28RFCKu2LNHSIy4ksH3AgwqUdMaWHkcEpyI9ZnPf2j6KfQwG7mW7dfZr0i8O/xph2dGznmsIMRF86vpYFGVVc49/0n1FaPyVG+Yy2lI2gzgeM+gV/PmWnWDf5+0TOu1xhfhyaKscQDs6ayx1X/QmoZyOtfhT1P+wcNYsNFwZ33GxyOHm6oGDHxMCnRlOmST3yiFd1De7K/MdRFbsrK6/4OHe9z6cZ0g1VTT6aBAei1e3QgKdjbpeO6Mpflfjm3R6S0m2xurFKRCWpYqZI9jD7J6oc7KrBAzNEdYZC87 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tjGaxxJuBZm9olObNIXf8tLogQgionFgtB63pOfkFTcSvAty5VX3piv+eZO51SOOpgGXNwLkfXNGLt8mZG8YdNnlyacvePvUIvdnQbMzQiOcIM3qMSduvNjD0sTE/EqJzegSsMtLdMVLFjHlpsXRDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68f1c86d-bf0b-4fa5-0fa2-08d95fde1709 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2021 11:16:12.6630 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT057.eop-eur06.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: VI1EUR06HT137 Subject: [FFmpeg-devel] [PATCH v3 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: RhygQom5CR9d --- libavcodec/vc1dec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 1fb1950ade..0f7c07f2e8 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);