From patchwork Thu Aug 12 04:48: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: 29472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp409316iod; Wed, 11 Aug 2021 21:48:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJ0EeuGaLQZ2mHHStb3/v1/vTWCXMxZEZBTh/svvuWx7aEiAA6NXcqSPXs45wj6sAb+QdE X-Received: by 2002:a05:6402:2317:: with SMTP id l23mr3154555eda.265.1628743705778; Wed, 11 Aug 2021 21:48:25 -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 bl23si1569537ejb.497.2021.08.11.21.48.25; Wed, 11 Aug 2021 21:48:25 -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=ijNlsPg5; 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 9295968A351; Thu, 12 Aug 2021 07:48:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2067.outbound.protection.outlook.com [40.92.91.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81B8E68038B for ; Thu, 12 Aug 2021 07:48:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DHFlR0R0EgrdEcPgkgKA/Z2YdsuscFj8knWEVJKpxfmlGnp29tEqBX9AdmM6sUqMlzH7IUwS7pdcHpl0ZuLi/TJMldG+SKbk5xx7cUKN9V2mY19uyOIExHSCtD/NHt3ACeyqkV+H8ZBA7zG5VQHGNUT6sZfuloy2wL6j64ylWiVY5rwTrRoU8mSheEYVH93MH3LdeJKBSQx3lnHejC3ztqVdI4r1IrbZOwADHOaR6E4XDyetCGC8At6nJQsJLCE/qTebyD3RKaoi8+bLx661fMLjgvhuJ6uyZNRcxXg/itWm5Lulg6c+iveCvuQ2xVoWrP2aGHahR17giPgBpCY6eA== 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=spIOdq7yH/Lmq0Hg5ffROaXEzjXBfM3wEugCfcvW4JI=; b=HyHMgSAdxxBP8SGJbx6A5iWFakucbanSxUfx32RjI0j6/JUU826L7nBiGJZBELzmnNXHLNEx9MkfCLJCsxPPIBi6BQfZOebQfWQ1gAxVy/p2q5KR18uUJUN0CZ8jOhkU3Cifi5P2RIIuzbeSWW9i15ePrwxdguSGqcFe8Uv5IQgS7P+qFVKXAjCI+3RCivqJ/sGo1iq7fDPSaHdCY8yiOzmdQsuYTq5/68RP7HockTy7k8DbMYuMxlBUMu6w0W3uQuOZuZsHlgt4HuQBn3c0O7nxIx9Y/49C040TEmr0P+znyh48ETSR1kv4WQAT6OjoSc+IOEdQlCUkj+yhXKuQww== 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=spIOdq7yH/Lmq0Hg5ffROaXEzjXBfM3wEugCfcvW4JI=; b=ijNlsPg528Jf91NNSWWToooiXV7cLs+Q7Wxmrk7XiY9wg9w+v6rPaY6O2iHE2fhU6sRsNsFOMVHwxzDlAS3ty3EOOaSu521gH4brL0ZI1NGykhfjH22XIqshfDC5psee0R79xECzaQTLKUr7cdSjlGYa6niEf85YiyUlRXMfQcmutOX6BjL/KKouC+v+F7pXmDCzpFzQePr3B5JDQkPtuuWL+hwUK1WvoeC+/P+urtr83xAjSqgFNuVKPTVPUOxCWLXZ36/l+zp8lr1yx9V0nuaspF0KffUNF6nu5EriebkHlAbMoDeOEqAIajglAKZVeIfqoCq7Kbl/1CF6csM7WQ== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::48) by VI1EUR05HT070.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::250) 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:48:15 +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:48:15 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D3962640A3964FC95A45B711C400AEBF7EF945685048C6F879297E794DD941C9; UpperCasedChecksum:F7716254DAC6AEA43FDFD43660C1C271F30494EE0BD55ADCBFCA6E8936CB5775; SizeAsReceived:7174; 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:48:15 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:48:01 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [suzonibqt7H8jFaIiXYAYJEb/AXVtWzx] X-ClientProxiedBy: PR3P191CA0054.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::29) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812044801.4046-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by PR3P191CA0054.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Thu, 12 Aug 2021 04:48:14 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b9d93643-7f31-4693-dacf-08d95d4c6568 X-MS-TrafficTypeDiagnostic: VI1EUR05HT070: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9NO96gym3YqbmuGBYwvTCnrjLZOMm7pU90m1aB1bMkRqMtza9iWUMLIYTQfiDRJNE4ATNRNEUzCanDJ6wkYlVaXBRI91zdaU0wJ8W/M5nDkWydxYfrgopSP0WVQBOYDXz9yO5jXhzVIcEzq5yHT/bvISS3RgPHbMYp9OZrqY79O4qlFajyz6EAuLv/HPkTp6leYeaRiHrumg6gmDt0dv4w4HDrCMba+UiAjzUk90a56PMXlXJVNg4RI8B1G+QySXFS9w53j5/ZQ5aH98KGxqGfUpUYb2sY236Fw5R8dRl62h0j/OB0umATXa2/uo3U20wRhemU4g2u+MheElkngmdQd+0jfZB4U6uthXPI7kMn8dicWRvapGhneAKRKFzQOETauks793kDTRe1cUB/L+3aEDo5rpM9BE2v0w2gXfH7ZZlBdYQwE8oLxXyLyemP5W X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nRQwkj0dOtAxQ7R9TnUSZwr2vAMc7VbC0HuuB/8vCsh7110VDU+EfsO1LBPStAASVNSVFmTzs5D40Q3Bx7tHhgME9f0mMSogSv7+72+aP3s/s4H2Y/nrk1GqVu+oVSYPxaKVcbuZ7iPBlwGus1rBtA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9d93643-7f31-4693-dacf-08d95d4c6568 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:48:15.3040 (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: VI1EUR05HT070 Subject: [FFmpeg-devel] [PATCH v1 01/10] return value check for init_get_bits in wmv2dec.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: 13P3AI3cEjEM As the second argument for init_get_bits can be crafted, a return value check for this function call is necessary so replace init_get_bits with init_get_bits8. --- libavcodec/wmv2dec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index c500e3e779..73da73c02c 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -101,12 +101,14 @@ static int decode_ext_header(Wmv2Context *w) GetBitContext gb; int fps; int code; + int ret; if (s->avctx->extradata_size < 4) return AVERROR_INVALIDDATA; - init_get_bits(&gb, s->avctx->extradata, 32); - + ret = init_get_bits8(&gb, s->avctx->extradata, 4); + if (ret < 0) + return ret; fps = get_bits(&gb, 5); s->bit_rate = get_bits(&gb, 11) * 1024; w->mspel_bit = get_bits1(&gb);