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); From patchwork Thu Aug 12 04:50:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29477 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp410628iod; Wed, 11 Aug 2021 21:51:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGaD7AeM0PMpk+3JFEtvnxP3CxBHvL7YqZtz7ggWgVkjWVJw8iz0UWXSxdfgGnixYvy6xm X-Received: by 2002:aa7:dc56:: with SMTP id g22mr3228235edu.129.1628743861621; Wed, 11 Aug 2021 21:51:01 -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 n11si1471833edt.458.2021.08.11.21.51.01; Wed, 11 Aug 2021 21:51:01 -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="hOp/dTJp"; 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 BFD7E68A2C0; Thu, 12 Aug 2021 07:50:58 +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-am6eur05olkn2011.outbound.protection.outlook.com [40.92.91.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA194689AEE for ; Thu, 12 Aug 2021 07:50:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZNM5RqFaKxWN5uj7IzGyb2doiIqs3m5zmOuYy21y6zaVHCae6TG0Jm6KN3vm+yJdVpafrxMIFfl48nv49VFtK3H3Myw9zQAW64zAIbMMCe7fFr1egvSYTeQ80A1l2zB677D2A4uE/QphYcvtcsO9Bvh/4M21Tp1Drxua/5eyQyIfT+AqpEm4S2w/Cd1Exxo9aNqekAFh0lGYLIUdulyhvruZPnGJxBUIIHLL7615engqiUzwT9xnq92ebfchvho8D3OQS5h8rld6fYiZ0FDTdvCk3qRixS7Nzc0s/G2TWQTtmrndm7z0aDH8d8YWcx7ZKD/h6x00cgwdsbFuyhZ5Ow== 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=5FA4K4bqrJ30PgaDyV1+emngaX3nhr9WrArrXUPJTqE=; b=OjEqR0lLgBOIkSyD4NYyvnNteFrZMIQCBssCBSrNjCQnfNZyvC0BygsDz/KhvMY0tmzPItkomXxTTmV0GnR2TGWvP5Ztjb3WArg2RFIjUbotdvE1qsr3LOcP6L8xuJSN8GRlamcKtBrLgph3YIxf1Q0GmEgzGFBFnjWLDPWlhMpFH1nj9CW5w0yL6JXhMCWpVj/YCW8oJUgRBndf2MyESx5NcPUhIyBoEku6jO8Olo7tm4Blqd8R1q81ZqUQ5krc4O2VaKeZiKFS5SWhAmsUoYSJo6jZf3BPoKjpbfqzboMzSCxZGac21VZkWKnm0ND9eHvFdkYoEp3rzgFDrtvEWQ== 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=5FA4K4bqrJ30PgaDyV1+emngaX3nhr9WrArrXUPJTqE=; b=hOp/dTJpX4L8PpXlmUasgo2sqPwewjVsMgyeiluNDRc+x4Bvo9AWdKmshHTDqQSlzkM7+V4ywfe6WJ+qcQm1kuYTJVPx4/I2rz8F7/mIPzfobCg4clu6r5yLCfd9dUt6WinsjAhlwdBu9G5RiLNRkTBqZYQokYIYhLOmHvyjadW0c4K17ATIk0d2XT0sY7n4A58xbq6arpYfO7boKW50EPCaxrp0uidzoND/yesRLip6w3RI/aiwEl/HKvS4l/H66GcYXjROC8TwIW7l02ZzOlT6wQCz3gcRxgH/CsA5yORs6lpdTnbIgxqGkV2M3N2rfUytzhH20u9K4BZBtwbPnQ== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::52) by VI1EUR05HT034.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::318) 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 04:50:50 +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:50:50 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:141464F09486AC6D6D11F64D1B5980195C359401DDDBD44EED43DF84ACB39C6A; UpperCasedChecksum:F62EFAA30B71FFF9306E63CBACF82D01345D608BDC2078C399FB7F6F883AFDFA; 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:50:50 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:50:36 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [9FaePhbgrVLizwoDoGzhcTpfoDm4+TY7] X-ClientProxiedBy: FR0P281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::21) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045036.4702-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by FR0P281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.8 via Frontend Transport; Thu, 12 Aug 2021 04:50:49 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: db9acdf7-4a51-40fd-e1d9-08d95d4cc1b0 X-MS-TrafficTypeDiagnostic: VI1EUR05HT034: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xezQLUqQQqSrgKlGT1mGMCVdg4cZyy4ZytqOTEWY/8vrfKWbp+waw84ZgSv17TmN9AREx78UxFwaoUP1QQFFKxp+XaeAcJWfaBxImhqmfKjqT9NV7whLrB1NCNMZJ+VuxyWgjNI19l8ws7Y7z4FMgNZPI5c/WiU0a72lmbHduwHmAcrs/5nfJwsQgTZPaBp2JSwdgB7xFqufj8CEx/uqHR1rJbFNiW5ef4VA6oAkUYPURHx0PF7Yj6Wr6osu5Y3Z62Ch3rxD3x0orQ/D2q9lg8v2dl9Sfra8wqFRFMeKURaHTWvwmemXgpqGiXl1YhVt59Uoz0q5S4V7StgD/8HYRL/BxoP40ax17y+pe3iSnsZfe2wc7KHuAZfboXUamp7ljNgfCL6F4+Sa8OkY3Q5bzhlp02c7sKh+rMa05UKPP6s9dDqPLs4a8GQQ40TnGzBZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TaYixtx4on38EM+kmUGXV1oqt+OM4iob7wyfMxKONUJotHPSVdRChQQvd7D9BxNqJMRbV+uE7IEuBuFOjsbMyT33LjH5n5O7eBlrU6moyVjaITDQDUWbBmp6M3PpBo/EjaJXUVgQWVH/aT4z8ZxOJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: db9acdf7-4a51-40fd-e1d9-08d95d4cc1b0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:50:50.1762 (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: VI1EUR05HT034 Subject: [FFmpeg-devel] [PATCH v1 02/10] return value check for init_get_bits in wmaprodec.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: Cap/nMYORYK+ --- libavcodec/wmaprodec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index e0d00d2d37..23df0be6ab 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1615,6 +1615,7 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, int buf_size = avpkt->size; int num_bits_prev_frame; int packet_sequence_number; + int ret; *got_frame_ptr = 0; @@ -1666,7 +1667,9 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, s->buf_bit_size = buf_size << 3; /** parse packet header */ - init_get_bits(gb, buf, s->buf_bit_size); + ret = init_get_bits8(gb, buf, (s->buf_bit_size)/8); + if (ret < 0) + return ret; if (avctx->codec_id != AV_CODEC_ID_XMA2) { packet_sequence_number = get_bits(gb, 4); skip_bits(gb, 2); @@ -1734,7 +1737,9 @@ static int decode_packet(AVCodecContext *avctx, WMAProDecodeCtx *s, } s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3; - init_get_bits(gb, avpkt->data, s->buf_bit_size); + ret = init_get_bits8(gb, avpkt->data, (s->buf_bit_size)/8); + if (ret < 0) + return ret; skip_bits(gb, s->packet_offset); if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size && (frame_size = show_bits(gb, s->log2_frame_size)) && From patchwork Thu Aug 12 04:50:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp410842iod; Wed, 11 Aug 2021 21:51:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDDe6dvCYWZJa0C9PPsVCOL36/2rsalEWV9Rv0+i+wqDEsgxOv1GK4sGqgZaky0Ol6Eyj7 X-Received: by 2002:a05:6402:2217:: with SMTP id cq23mr3178245edb.56.1628743886146; Wed, 11 Aug 2021 21:51: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 um28si1215612ejb.255.2021.08.11.21.51.25; Wed, 11 Aug 2021 21:51: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=ixLJn0UX; 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 D334F68A066; Thu, 12 Aug 2021 07:51:23 +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-am6eur05olkn2071.outbound.protection.outlook.com [40.92.91.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 227C168A066 for ; Thu, 12 Aug 2021 07:51:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e5bU4BSOKrHAMACA1r2GW+LFYJJMk2mjSe9wwH6tjYc4rex/5mpSoA4EddcFk2KEXOR/x02vzg92/el2QW8CLv5vqSuf7+iYoVuSDg9espMKIpLnuGTRIumJ6MpbrZjSB0YTip2Q14Fywko4vS6pd+eAGOMK+akz2ZApZUCjcuMAVAkkANTHF08vHPuRN8MEZQFsFsVJIcjELDHu7D8PUcKzDe2g2L14Pb24ZGnFHZGpysAEHqsMR8OF1+rDcFWq4QzhhywzgfJChmsODI5JTU0mv3A7/TZcxmR9agoO6udMVCk/8srAFccSp34VB6t0/jWprIH8u/Kd7VxTEHv3XA== 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=BH9WBA7XRdy2u8necftepIQpoxQYv2G4MgNQM+IVMlw=; b=OKf95YHL4EBmNSixkNUcrm9KbKVnjgfPwFlPJChm2jhMiMS/1dzeBGpDpE2XSNrqNa+MKK0mmwUDEjAh8AIQzDXmiSMOVoP549L1xf5n2Rs7qJ4YTN2KA9f2QhSA9CiJ1PiXxJ+/RLOoMmanTGp7sdogrVCQiJARX2xduPK5kEXnyq4/SeYNphs0hyqv1kEVqVZoke/k0CEHqM5yRDyBQxQu/vtKInT188lUOy8rvdDQVxzVNj6Z/e7qOAYydHb1ab49O6ndvLW/L63hnSIkezdCrBLO2srfOkP9ZFfxcXS/ndfUGfLy4fbFb59obhEd2OMNACub43Kr7Xwracq9Zw== 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=BH9WBA7XRdy2u8necftepIQpoxQYv2G4MgNQM+IVMlw=; b=ixLJn0UXFoQvPnwwca0v9c0UjY2VTgWTHZKE9aEipo5rM4pUJUMHE+6YwzogmnVVLwWtcnM2brNENvcJpdOsYhDvZJEYxRrT7lWFOzz7czStHZ3N12wSeoB714FT1ufdbZ/eyfGPa+xP0Av5//b0WAkf7zWhXcJe/W32XLx0QYNSMQ0mfknwRPa9BH/dCns/IwY3GPVCU9FTHF+PTpx6Ss/ds0FDsD+IlA/qzhS//fNm2kJ7WOZeP8qpVns7gi0PHg99aHxiMjB3GQh/Z8b6uwgDuz4l9zCGQb9bz/6JvArOFMk9aXqFcTkdgAp8ugPDTS82svIw/6B8haUMHju5Ig== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::40) by VI1EUR05HT198.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::251) 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:51:14 +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:51:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:616CE06310F034A35F0704E0B290E18A028710EF4238E4444319F880775CC659; UpperCasedChecksum:4C718AF49C62740E9E0CF14A54A67FF69313E6600AA65DFE0E2730953450EA3F; 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.016; Thu, 12 Aug 2021 04:51:14 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:50:56 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [VUX34ZqgbC9c41e9ZxNh0MMoomW47HQc] X-ClientProxiedBy: FR0P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::14) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045056.4758-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by FR0P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.7 via Frontend Transport; Thu, 12 Aug 2021 04:51:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c02daa46-9a50-4562-8e4a-08d95d4cd010 X-MS-TrafficTypeDiagnostic: VI1EUR05HT198: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJs4LLJL1zYFeAGI2wF/yToPV/EgKoWbaUynlIGr/mpjJyK67Tjhz7M2D7kek6HGq9PGA9LfY1bhqLRF9W8h7ZjKQdCEk+j2aJm693RSv1QnnuE84ijmEiP8gO7lkclE4T6/FWRJwIHASBmPm9SCAb4M24+fQubct7JpieAZ4J5mcM0VpInCme7Re6EGDb1EFu9vIrvmUmJCvbSymOibtqqMpCAPtb3QcPM0wIJaVkzJZ3nlCEeCIggmvZ3ySEdbhZdyvNmz+uZgAQkSjCuJZdT6zBL1NdcC1POf1SxBlBWW1atZs4h9MmTehg9memefeQV7Cc9o6N74HI5mEficU7HnU0V5F+bA+yPreA72MCNL+GFLTww6TVf+gHzMyx+hp2QQe5vv1QMwdkbsU/zLhuPSNFkx4ep0yGeIVeR50ueZcsAHbtSk1VBOlxSIkZX3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WbrdHdxAYKMAa7pIQEYtpacADqXjhrDj4pQwHojtRrD4BWsq59VM3jRmGgy0uS8BThMupJKc2sW3kwRxtiaOQ21m/yrCSjx+DizEjv/hn0Zf0g+K7Qem6YZFZDs6PFpGj10LsdgXoF2IaX29yFAHVQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c02daa46-9a50-4562-8e4a-08d95d4cd010 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:51:14.2574 (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: VI1EUR05HT198 Subject: [FFmpeg-devel] [PATCH v1 03/10] return value check for init_get_bits in wmalosslessdec.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: +yd+dXdCtYRU --- libavcodec/wmalosslessdec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 74c91f4f7e..a2e83ca99c 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1187,6 +1187,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, const uint8_t* buf = avpkt->data; int buf_size = avpkt->size; int num_bits_prev_frame, packet_sequence_number, spliced_packet; + int ret; s->frame->nb_samples = 0; @@ -1205,7 +1206,9 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, s->buf_bit_size = buf_size << 3; /* parse packet header */ - init_get_bits(gb, buf, s->buf_bit_size); + ret = init_get_bits8(gb, buf, (s->buf_bit_size)/8); + if (ret < 0) + return ret; packet_sequence_number = get_bits(gb, 4); skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently unused spliced_packet = get_bits1(gb); @@ -1256,7 +1259,9 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, int frame_size; s->buf_bit_size = (avpkt->size - s->next_packet_start) << 3; - init_get_bits(gb, avpkt->data, s->buf_bit_size); + init_get_bits8(gb, avpkt->data, (s->buf_bit_size)/8); + if (ret < 0) + return ret; skip_bits(gb, s->packet_offset); if (s->len_prefix && remaining_bits(s, gb) > s->log2_frame_size && From patchwork Thu Aug 12 04:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp411295iod; Wed, 11 Aug 2021 21:52:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4FEh+/DQhBnIGcO7lrq8y6gfE+tB4x1pb+24qxojrTRFxdHeVEsL0GQvWRdhj31HfkXqL X-Received: by 2002:aa7:c805:: with SMTP id a5mr3143183edt.23.1628743946209; Wed, 11 Aug 2021 21:52: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 o2si1376808ejy.80.2021.08.11.21.52.25; Wed, 11 Aug 2021 21:52: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=n0xTz2RR; 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 F10DB68A33F; Thu, 12 Aug 2021 07:52:23 +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-am6eur05olkn2097.outbound.protection.outlook.com [40.92.91.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9322A688181 for ; Thu, 12 Aug 2021 07:52:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lCSULo08XKjvUxwYhJRrp3w/E7WlXye232lkrbVAtgFkDzVWFQZgnVQOwaOr9iuJ7rMju29sHnqC8B2PTLSAfVpwPJ6n1FLZkYm+SmKcWqpGJGXHvAneL5pLsWdWo2ygJRu0pBrSL9+4I2zninC+wbOq8Lx6hcuTNm/bU/kApDC0BVzxyZ5aFt7HfGjU6L60+PdREmU1t8oS54WY+titrbNA4qmMUg2K6jfm7tJW7krTm1MPBRwwR/QHf8d6NiHRSWO4CRT1Fl/nDL+xUUor8IzxebUMyzNncFQ7cFB70rYgSdA7y70XdJjMssneEa+9UckvZLy9qh2YbueqWAgQ2g== 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=k+nxAFjIbjVfgBfmytx0ItH4glXaqo3AbxvbjimG5To=; b=Kxe/RB9dZqw8ckmnsORpEE9hRp8xoNqwy0IX0vZk7KR4Fpx236H/V4Bm9iLpSl3r8lZgraQupRYh8WbITtOSnX/WBAzW30L/VWt6gOapk9vq7pDA8a8FUDvw7Qszl+flIkPQjExpkhDhrEiU1QfcdPnWYJsQn8IVlWs7Re4shXijGbWtRq4U7V0MTXb6JkM9KVy9HW4Y3GvRL/IE76Aim1yPVPsK9xAxYb8gYxTlzUzFl2PwXNmucsDlMbnVCE8Crbt/gG5TwXcRa2YXgQ8Uebo8/w/wgx9EpOVlGkG/CRprmHx0jucd5hQiqJ+DBRA7MvBzdl7ydFLJ2fL1Vv6Ijw== 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=k+nxAFjIbjVfgBfmytx0ItH4glXaqo3AbxvbjimG5To=; b=n0xTz2RR0uIOGBAg+TpA9s9ZwmcLUPk/KnQ8dOLkfL6A1lE7nAjkxlAZw0HSgLe5itL7EcmIVMTxEkbJ4tA0DPJvtCUDoH9lr+eprOrpcDuz9ihCXxw/qPyUkY6Xr4oZpWbrgCrVczqqWVaR/jX3ONeHJFDLF9SwSxhoG2vLA6fjdVwFFvYWG4xBe5uVoLR9Dbz28KZXTLcNeh0TNBiQ8+Mj5Bllv911HZ1uPI2h+z0DEIJZOMLN47sPkc1H6P4xyY/K1xMjvxUkIVRJO65o15NOrDnKxm8KpIUAT8yfmhkYXtJaN0Rwh36ys7hEE87N8JMrXQhTvEpa55sTIMIjKA== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4e) by VI1EUR05HT123.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::466) 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:52:16 +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:52:16 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:067D0F5156AEA807D5CE21053361CEEC813AF2364AB6C6283F5699CB5D62BE63; UpperCasedChecksum:6E9A123E749D6BEA4B4CF21A2FC677877441FA407E96066F4ACCB115688465F6; SizeAsReceived:7179; 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:52:16 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:52:03 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [t+HfRMaKbd8nCiVsHTS8ByY6RkJvJy6f] X-ClientProxiedBy: AM0PR02CA0152.eurprd02.prod.outlook.com (2603:10a6:20b:28d::19) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045203.4812-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM0PR02CA0152.eurprd02.prod.outlook.com (2603:10a6:20b:28d::19) 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:52:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3887d805-9655-40eb-5157-08d95d4cf50d X-MS-TrafficTypeDiagnostic: VI1EUR05HT123: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: II0pkJ0Jxmrbfl1moQAjtRP3/eSn+FR04zenE5hTTKVIAbldL5kMtd44+DjFKt4FBlEV8RcqwN7l1zimmNKBWMAtoFua5Ay+bjdJKIeiYgrHl17slaLS7yH0Au3hlOhOwFyA8zNY+zJxgSPxhTxT1579wo7P+zFnqOzwQ3mCU9v04AvtEizGBmIxiBuUm0VFEwMcHrmL38ba5bAE7cvc0QC3zMNuAGHzkfu9woLJmIgxNNo/NmZLQ2AesHAK1g0+XGVZY4AULEj0tgRY213DGNUwD1x0Z/8nsUDbOBlEXQpLmsxrzj3DUCjT9C9qhxfvZV+BInAYmSvVhaEeC1yfz/PSyJR0EZGbszP8sFDRImVjvBZmzHdHAgt/81pNdPy7Ssa5tk2WAZ3VaYWEK0VElQtYlxkSFBR44ftDcWbypx+4HcsyZ4Qs4jZDxq0M4KPI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S1wjvJUXuuHSeU771+iTWnq26gD+XzbKJjlW8fp8S6zaHGzo6vjOfh0l6EbvvKPGSvgRWP8DjICBqg0+9ylSn/9/chDv7st7yermgwiYrYxlKDJIqsLw+BdtkZLrQY4+r35JUzp2NZGQooRCm4sdIA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3887d805-9655-40eb-5157-08d95d4cf50d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:52:16.2930 (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: VI1EUR05HT123 Subject: [FFmpeg-devel] [PATCH v1 04/10] return value check for init_get_bits in wmadec.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: FBNSLIkecgWr --- libavcodec/wmadec.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index d627bbe50e..6ac6221d11 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -822,6 +822,7 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, uint8_t *q; float **samples; int samples_offset; + int ret; ff_tlog(avctx, "***decode_superframe:\n"); @@ -838,7 +839,9 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, if (avctx->block_align) buf_size = avctx->block_align; - init_get_bits(&s->gb, buf, buf_size * 8); + ret = init_get_bits8(&s->gb, buf, buf_size); + if (ret < 0) + return ret; if (s->use_bit_reservoir) { /* read super frame header */ @@ -904,8 +907,10 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, memset(q, 0, AV_INPUT_BUFFER_PADDING_SIZE); /* XXX: bit_offset bits into last frame */ - init_get_bits(&s->gb, s->last_superframe, - s->last_superframe_len * 8 + bit_offset); + ret = init_get_bits8(&s->gb, s->last_superframe, + (s->last_superframe_len * 8 + bit_offset)/8); + if (ret < 0) + return ret; /* skip unused bits */ if (s->last_bitoffset > 0) skip_bits(&s->gb, s->last_bitoffset); @@ -921,7 +926,9 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3; if (pos >= MAX_CODED_SUPERFRAME_SIZE * 8 || pos > buf_size * 8) return AVERROR_INVALIDDATA; - init_get_bits(&s->gb, buf + (pos >> 3), (buf_size - (pos >> 3)) * 8); + int ret = init_get_bits8(&s->gb, buf + (pos >> 3), (buf_size - (pos >> 3))); + if (ret < 0) + return ret; len = pos & 7; if (len > 0) skip_bits(&s->gb, len); From patchwork Thu Aug 12 04:52:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp411498iod; Wed, 11 Aug 2021 21:52:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/tTol/NgpRWOLfIsNiNxzi+v04aYMIaLlRTnFVCvEwbGToJ4Mhchmky5GZsKP3saz5JAM X-Received: by 2002:a05:6402:289b:: with SMTP id eg27mr3231991edb.90.1628743972451; Wed, 11 Aug 2021 21:52:52 -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 s17si1554762edy.382.2021.08.11.21.52.52; Wed, 11 Aug 2021 21:52:52 -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=VZqHApVQ; 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 20D9268A3B7; Thu, 12 Aug 2021 07:52:50 +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-am6eur05olkn2074.outbound.protection.outlook.com [40.92.91.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A080680068 for ; Thu, 12 Aug 2021 07:52:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IKxkdUtqgx50ev8FIGi9bSxMnkpSsKxqG3WVVcVV5FAFiNXvZk44DpYqkLFUcBZyAOrIqq5gB/sdOEejusOf/bKJOHaF+SNTiSPkPM2c8zFBhMZ5J/qpt9qKC7iPpyzbRdIDpqBn8KB7qOcSNU17Sv9EoyHB/ec2caaicx4WhEkW/Gp33gqyoUqarzHdoUY5EoO2rGWklV1gAucmQ8TDP8mHuZsM/i2/L1USZPvRJdvJlSE+TCcIaUXMiSyI8wW3jufAvgykrFJHsJosw2QLu0orqpWri4gKUxgXU2BxPRYyAQqmjN9QCRUCyMUZuuLdILDxcR8Mw7IuJenX823cAQ== 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=Wr1XP1rlNQt1j2el9nytTmkaJI2dzPSqsdIlfwiGNHg=; b=Ze5bIp8J/8yzc6BuflXHkie9TPhNjc72Pbsm5TrlmAoUQsMnAWCE8uiHM0pE+AoOGrJqv+ZZl1cq/0XuDBRCWN2UmeRoL6EvqqVlje1gwLYkBuvPe5t01jl9mKX7nVEEdZYsx16ClcVJqKcOV4ISsoVTl3JPcz7ACq9Ph/pXcS1U8qZ25WgCb9AwfWv2ncXdT431M3tAM43URVpGDdoMJL9kf8Z12bNIgggHsZfZQ6zFwHb1Zi1upHcbzcDvy7a+M1zXKsf8/c3Cyskrr5AXbIA/m1Dy8qLV3ZJL6nnmJ/aNbB12OcE1Mn5r6mJrhchMKF/QxgmBfDTQeGKO+TxZVQ== 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=Wr1XP1rlNQt1j2el9nytTmkaJI2dzPSqsdIlfwiGNHg=; b=VZqHApVQQbzW+QJBrdcPqT6Dw7EizikOo5clvoVQS/57MSKccMytACFhW9m+O2TxFbUlQnsjKZmG5bshg7B5dHPN4ett/d0fIUxsFc+DMvDjGagifFujBBxrDa49fhQon+PLeT3cNXNVITTS+SqcFr8kNT/37OcngURdnVKYI3sTOp7S7aBRQN5ZskJmE4AIs9Ob45NVgGrDq8R0U3MtG/VMmLnz+2PvDnGabyzhZonECjXsjnlcokMMDgI968+7WP3f3ERt3hlO6XNQ6vGXFrvULHRCvD8x+BOHZ2SKQi1RcV1ozNKtUOu4XIefsazSXg5gdndPMA5/Br6TJLWWYw== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::4b) by VI1EUR05HT208.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::312) 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:52:41 +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:52:41 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:81C013E96477BE699B7CCAC39A584B0AF867C5CDD947D991E3B830F6ECE85B45; UpperCasedChecksum:D2BB61F5C4C41CADC0EEF32B26429AD635DF85A783F75DDCFF18231F02FA3701; SizeAsReceived:7163; 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:52:41 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:52:27 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [M2GF+S7YS2bCvESlhgDYWd8Fqx1L/lp7] X-ClientProxiedBy: AM0PR03CA0038.eurprd03.prod.outlook.com (2603:10a6:208::15) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045227.4864-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM0PR03CA0038.eurprd03.prod.outlook.com (2603:10a6:208::15) 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:52:40 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2f76b04d-6914-4d84-86fa-08d95d4d03fe X-MS-TrafficTypeDiagnostic: VI1EUR05HT208: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IqZWZicN/i2Gj4ft02NsmgeiIKg/9nqdtYXtdE3l8Le3oGvj6x+2fadtk9vJ6MX+3S/HhKrLE03Qkb2SkvXKnCVERM0eaf1+rfCbyyNEbGdBlAxT/eYxLGA3qdjzidezeXcDJTSw72TPil6ib0F3SvHuiPAdbRciWd2D+7XZGX6eiCewrK3mMeS7R1R2bRX/dVWjGmCoNZ7wLh/y+wJ4p+E1w4DmiN5tPEaH7JcHAWNIj18Th4w+xFaCiNv3Jce/1y0hnJtE+M44N4bpWEQnUKZFCOX1LbFkmAZEVyF4LVxo69llmY0P/s5vH+VUAU7ohlVX3IVsMnivF0YmN3+TAej7gVW1o22pO+tW2SlcEDKKo+ys1PRCSWNlKsVPLTAg2NmCgVtM0k/w3tNGLAi/t/mPFA3nqniv/DLQNdLW3vpd6dQSlqi8MpfZTWW45js3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ym2zZj5ogX0CsnQfrxf5U3l9fBm4pSY6a/tdthmULyB9ji1uTr8IhuQZ1/+vj+xBqJncSB50r4GYqZvQGmRTg8S2/vv/6Quk6tKsn2C45j6AFN5Tj9RTkctPBhpv7iBDttR4RanvDGVyXLp2frMfbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f76b04d-6914-4d84-86fa-08d95d4d03fe X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:52:41.3788 (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: VI1EUR05HT208 Subject: [FFmpeg-devel] [PATCH v1 05/10] return value check for init_get_bits in vorbisdec.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: eoqPqVco6feP --- libavcodec/vorbisdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index dac2b6841c..80358f6359 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1052,7 +1052,9 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx) return ret; } - init_get_bits(gb, header_start[0], header_len[0]*8); + ret = init_get_bits8(gb, header_start[0], header_len[0]); + if (ret < 0) + return ret; hdr_type = get_bits(gb, 8); if (hdr_type != 1) { av_log(avctx, AV_LOG_ERROR, "First header is not the id header.\n"); @@ -1064,7 +1066,9 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx) return ret; } - init_get_bits(gb, header_start[2], header_len[2]*8); + ret = init_get_bits8(gb, header_start[2], header_len[2]); + if (ret < 0) + return ret; hdr_type = get_bits(gb, 8); if (hdr_type != 5) { av_log(avctx, AV_LOG_ERROR, "Third header is not the setup header.\n"); From patchwork Thu Aug 12 04:52:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp411647iod; Wed, 11 Aug 2021 21:53:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVPon8bA7XVrX6Tzf4PJI7bHDCl+feCPGcO/W1s3nfL33bymdBaWJOxGMRgsU4FH0kMoqW X-Received: by 2002:aa7:c519:: with SMTP id o25mr3169043edq.305.1628743989926; Wed, 11 Aug 2021 21:53:09 -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 f4si1486477ejl.218.2021.08.11.21.53.09; Wed, 11 Aug 2021 21:53:09 -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="Od/XZqde"; 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 3E82E6804A1; Thu, 12 Aug 2021 07:53:07 +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-am6eur05olkn2048.outbound.protection.outlook.com [40.92.91.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D9DF6804A1 for ; Thu, 12 Aug 2021 07:53:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q/VVw41OhkDcdAj/sKqWNEMmILZ1G3Vjl2fYgFoN1ngp8bQFKBC9NgeB4lWwSISYd50jBBCcYbJcyHGpRoTcBKDPnHngt0EmnG6zMgRLKmA103w+tk03E7pLzu8yD+MCkkiN/tRR3WB+K9GkX9EOvaQ2rKj1Yi/FXuCO4LxoOUtl1QtwatAWvfPL9Hl9puibho1Tea44l5lJTezZ1giSML1XNDmyESqIdSE4id+VsU2kxYbwGW/BoynZka9y38yRy9BmfJBZhylC8U8SVj/sc2kVVqVp86+HEj8oFdqPNfVw1A97Ji6XgIVbiJ9oIwQZWrtkbhfy/1CHT+G6dua5eA== 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=WoStdA7VYmlfgXgA0uokp78UM0TPGZ01iXeinKFJgwk=; b=AeoCvZ9RU2Rq1TOeEMNAYkvGOXu+Idnl6HpUw69XkHmdnKVCmYC9+pCsZZluIKosg7dQOGeBM5tUpuGPrMbf5jw9guiY8fdzeKVuclfdSX3OBKYyedyB11iY6tqzxUwPC7wVjhI2vlT7ywV9YfXixY4LGaf9xIVGzBYhkTQqG181gpwT/hOZsqu5UZ0xkdhSAixYmZVAb6wu6pDfATakyhlheF+H1+botvLBz5TYJCUIYsq7cWp+cuNqJ6sibmApCLOaFnnMmruv3YWPbQhNbuRABPLADVNNl2pTL2GAdQTKKvmiUngNiBKnt/ScJnFVgTBPclxRXBPeZJxLGL24CQ== 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=WoStdA7VYmlfgXgA0uokp78UM0TPGZ01iXeinKFJgwk=; b=Od/XZqdeTPSG3Dg6FvDQJFDlHTW4czYifQ+10jtGzpsPFA+I6H+c1sOfT6AnvP0iKVoMPf87dCdUFXaepgVmWz4RxDr04aS4tucV1Jw6IG9iKxMGn5LeL5fFUbDoMWK8D72zeGrBuJXrtcObkuk38XJf/1DThi3mYt93fQqIkeraIq2fUq44lRfF0R9mHWzZ7bXgjwsfUK/h82DLk5FtFejOXGeeAbCw6UefcIQUMK8typuIlJtszZ09cMRKmcV9X0kiur4RmPIuswPrEVVil8X5QMWEssXpgZPNjkhddvhlQWWWdy7P//xu7MnRB63l2ZHsK8OfArMsmVsSZfqy1g== Received: from VI1EUR05FT012.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::52) by VI1EUR05HT091.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::160) 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 04:52:59 +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:52:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C07EE524EB1E7C1024CC1CBC574B01CF382043CAEA6E9CD6555F2246B50C91EE; UpperCasedChecksum:51D9839408AA98070D6BF241C717D82BD953CCB556F9689B50A56A6B79FA3074; SizeAsReceived:7158; 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:52:59 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:52:47 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [fCLfxcYd68v+yNOsnwyFMjKd/Sh4VKVa] X-ClientProxiedBy: AM4PR05CA0025.eurprd05.prod.outlook.com (2603:10a6:205::38) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045247.4917-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM4PR05CA0025.eurprd05.prod.outlook.com (2603:10a6:205::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Thu, 12 Aug 2021 04:52:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2ddd4f7e-1f7a-4a77-1615-08d95d4d0eb4 X-MS-TrafficTypeDiagnostic: VI1EUR05HT091: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gkOVG0nnliorUHsowxBgOsaKSEbs+q8BgsT3Md5/6v2pqZgUj+zdNWpFCqhtgxxGQIk5F4Mxx8trI7SKUrD5PSMRNREPJOf42m87+ooc+UWvS/EVnbVEYJRxxZaRm/gG6eKclHeAMTV6GBkAYqy85sc1+Wn/Sm+KoKeSMADCfBqXo7amp6a6llH1DGfN0EXMowMFBAnoH8W+WbH8+bhPWRhVNVqNz7470oOy1HqmhlB49Am36IKrchEe3fFOZqE400SDW/JEGdO/8/gsKomiezSibigsNzcqud5I+pwu34by4swQSpk7138YSvb2xksKLnNMOnVcT/L+n+j7CTxzfXmR9SyKPa79o87eZ6vOT2Ece4hLEgXGNTB6eWSi+k/5fSDuH30FYlIkptfUcgqk+2jW9WeVuJX18dFvlEBUL6lkmuD6LQyRsI2JTRvBLso2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zodesfIGE4pJRyZIqi7vtEkFE9kvf367NNnB39yjBBS+wKKUXdUORvKE8kixtKw6L4aQVgAdoJ8mUPeZiJoc9Mp6ljxL/tNYQwmhdA/2ezmN4xtJ566ZRcURIU/4keFHxBqerqnpr11FMDhjWZpv4A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ddd4f7e-1f7a-4a77-1615-08d95d4d0eb4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:52:59.3479 (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: VI1EUR05HT091 Subject: [FFmpeg-devel] [PATCH v1 06/10] return value check for init_get_bits in vp6.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: X5Z/44mNvwi0 --- libavcodec/vp6.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 73822a00f9..149daa59f3 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<<3)/8); + if (ret < 0) + return ret; } else { ret = ff_vp56_init_range_decoder(&s->cc, buf, buf_size); if (ret < 0) 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); From patchwork Thu Aug 12 04:53:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp412233iod; Wed, 11 Aug 2021 21:54:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdMNgtjxExwRKkscwosQAOBu6VF/+TWZWuZUaq5FXYoJb/WNBP3M4HLpLfRtenuFHHj0pu X-Received: by 2002:a05:6402:2883:: with SMTP id eg3mr3145509edb.278.1628744052390; Wed, 11 Aug 2021 21:54:12 -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 s9si1366009ejc.456.2021.08.11.21.54.12; Wed, 11 Aug 2021 21:54:12 -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=dCV6VJVZ; 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 A665A68A46C; Thu, 12 Aug 2021 07:54:09 +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-oln040092074096.outbound.protection.outlook.com [40.92.74.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0801268A3AF for ; Thu, 12 Aug 2021 07:54:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bLS+69AoHmH3oPljs6ATxO45R+lb9SmLPKwExwE/uFynjSJbxfBNkurdeGFxV4NSvod4dRYbIbYi5zxsBhGPZ12nOtxJckujGho5IPhBWxKUaMKlH35ID7gc3AizhDjpPxUzyCOicoCNO4b3o8WSx8e4kr5wSIB7iz4SMZEjq3s4HNc8xUexpII+DE0Tsqj5/lz0WtyJoH/qZ9AcNS4CJ2ZGzsxhqSTDgOUpbQm2xLciE/ZtR/PhPGmxQ+A7B/Y9tuLYM2Ir6qQPp0MMp5P0cP+SF7PZO1inJzz7xr4hLKNqW9n5SCKZ/S/jMN2j58w488wVbjKSObwIKWbVLF39gQ== 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=hPedk8XS/t5lZjCBj7T48SAv//EwhDrjZwmYQBlxEt4=; b=a0E+f0xJNUJz/oarCZIQlTn8nCYrzqVdIN7MqDjnNkKBNaCa90Lvl/FEkDPVDT0imEzJx8D+H1sR3R8on6R64VHNnAdYbZjv8fU5HC7Sjgkg5L7C9/lW5ILzb6gmLC49/3pnQ0xfZ0YFsHqICbbheeaDQ+pnEBV+pESzWYPDThmJCixe3lB9o0Lw1xDFA9PcfPCtErOlJ8dWdqvefzDUT2rSAeG5rQMdcCNoTlELVgOKWHHoJMhsLLtj3KV4vXjNDLgp82zCbbaY6PukK1fsqhrn0Rv6JPkwXoFSz/WXqm1Z5lxz86lMwIlgLnVZXLV/wmarihwucy+sm1rPJ1k85A== 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=hPedk8XS/t5lZjCBj7T48SAv//EwhDrjZwmYQBlxEt4=; b=dCV6VJVZg2tBZ1raBVNSQMqzFHKgtZyX4l316dSGJ2mCsxJRQa2BPaQxSes0Ash82g3Azsak1+PfpSQQZbd/WepximzDkfBuu7SsHsnkB4bxWbsnKOmLddzWg8WvNAhoOP2hKFkRMRo6lwdfbV9Pyh7LxW6BsFHRCceao2MPsiBbBUg9qyOrEVGLDH0MhW+vOriOhckUb3ZBn+99xlrNhDcuFMT9030QCygYNsK+IQKgBMpyI3pq0uN8FScjtispquBOJD4S/w2nL5KpSs214L/usRet68bQvXB0ApQzkNtTm33BeNRs8k/y+SetpWqmf0l1JATxn9tEGwRTfVbhxg== Received: from VI1EUR04FT026.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::51) by VI1EUR04HT018.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::428) 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:54:06 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e0e::45) by VI1EUR04FT026.mail.protection.outlook.com (2a01:111:e400:7e0e::127) 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:54:06 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:767C56F81C5B7525631585FDC2D0EEE4609E00FB01D1B186EED76A17298D1E56; UpperCasedChecksum:A86A87888982BE0E883BEDEF7025C8C674532198975CD3CAE48CC4F70A9654F1; SizeAsReceived:7176; 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:54:06 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:53:52 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [cNeQriHIdPaIKYggzTVHCZOdL/iCViK4] X-ClientProxiedBy: AM4PR0202CA0014.eurprd02.prod.outlook.com (2603:10a6:200:89::24) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045352.5072-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM4PR0202CA0014.eurprd02.prod.outlook.com (2603:10a6:200:89::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Thu, 12 Aug 2021 04:54:05 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: eeeb1c38-eee4-4847-3c1e-08d95d4d3694 X-MS-TrafficTypeDiagnostic: VI1EUR04HT018: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FKKrWNuVYEmFp+RRWnNuney6axfwdYLn3cV06SNrp4YFCWqrg8KkLnxXB87HxFLdROdAWQu9skjDD84Jk9lasRbcIuYAt68HMV2w4MpvPQxvoizKUOaSCWdVvTR9xcArjBK1W4uz2AhvADeVP57jKSlSNeSvHXq012sJ/s6mwn8uM/6a/A8D+qiWRTbSFy5ITTSgv5KE+O7fJ25i4tMO0qtsaO1BMKLa3DbfPHkrjnVY+tPRY5TG4AMfM6+RS7vj+VcnyMqu+Eg1TLzntBx5Fu9/2rlpYhF36f/DU2+2y1r5iT8NRE/GzCCVOdSp9+DF05VpBZRipGjrNnLpIKo10epp6m/+2Z8YwQmLf7pDt+cdEQoJ5/Wne1VBye5c5e4GrYL7/jId+X5LGXWNl1ALMiosKm48RthNoCXO0kJVmbqF09Krlh8GzzC34nvluCWN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TXGxWQXfqhaKGZD2b3XizTQtTKHvKC9D7xvnkb/PzhZjn0wJQ5r9DJvbi/5N5kJvXtc+rbB6PmbB0peYuLIxP69J6Yfvv9fm2pGlD/Tw255H9wJsGKJlb6ysn2h50B6TQlNQEwWsO0YPo2GszJskZg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeeb1c38-eee4-4847-3c1e-08d95d4d3694 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:54:06.3207 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT026.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: VI1EUR04HT018 Subject: [FFmpeg-devel] [PATCH v1 08/10] return value check for init_get_bits in vble.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: vc1B7NWgJEJd --- libavcodec/vble.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vble.c b/libavcodec/vble.c index f1400959e0..d3e1804c7b 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -146,8 +146,9 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (version != 1) av_log(avctx, AV_LOG_WARNING, "Unsupported VBLE Version: %d\n", version); - init_get_bits(&gb, src + 4, (avpkt->size - 4) * 8); - + ret = init_get_bits8(&gb, src + 4, (avpkt->size - 4) ); + if (ret < 0) + return ret; /* Unpack */ if (vble_unpack(ctx, &gb) < 0) { av_log(avctx, AV_LOG_ERROR, "Invalid Code\n"); From patchwork Thu Aug 12 04:54:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp414554iod; Wed, 11 Aug 2021 21:58:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8KQaaAwwEvewu9OnuVrehXOrDk/hrzQiNnjqfBSv1zFZxmyUGyDC5vXPz++qNYGqNev8K X-Received: by 2002:a17:906:a195:: with SMTP id s21mr1901201ejy.181.1628744334143; Wed, 11 Aug 2021 21:58: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 w17si1658663edc.435.2021.08.11.21.58.53; Wed, 11 Aug 2021 21:58: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=Z7rPLuUI; 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 2501168A3AF; Thu, 12 Aug 2021 07:58:51 +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-oln040092074055.outbound.protection.outlook.com [40.92.74.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D60C68A2D5 for ; Thu, 12 Aug 2021 07:58:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YrvAvXa9u/rXZ8WUiSN66woQkIHMnj7UJqD5IvVbKVsG34TwnBs0fQbtbLeEcNYZYDrUGgonbyIXtk08lbv6kGxDf8r+3x+HdSSeNIDloGiHIp/+gMFmqj1nKUK21WCBlhA7tvIeINwFQCWY6vs2dLltQf1hrgkmPRrupqsBKuPRdVkwSsBE9tKut8ovQwX0rG/wfQrWeT31UUlzrVvdnuh6sKOvypGTsfoIXoTK4o5nerXfZYZNVpY/cn9cFt2iFRqjQ+Imm9CRNYNVkr/FiQhOpP1BiZ9g/MaR7w/bWYgpksrj3ioBoIXbrCl5mjfZmpeqFm3VXJWpE2W3qonP4A== 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=S0hTUP7BWfC6hR2qi0/oyeh3UArHUa4ewkVSrupcLXg=; b=E5GWwgN0MkWrEsWDb6OxcxBw95LYDvWql0jIh4WP2NlmespzQmQS/my0a5Zs48LqutyMdRV/RhlDRP4RWF4yyHLTnW6uFmk7biLyvzz+smVrDwKcee9bogEt1swCu9CpyLyXCTvsy3z/USK3mWsyvIEdhNFjW8tEQu3pjDnmRHRmNsYYHNrK2ReeIFKF9NJxuW8Adwwh8uc2dUyN/AIeZH1rzmEF5pHVXOARwzZMMuLYQxYyF9KYHdF2RdaI8vEEesniWFfeKexUmF57SLNRfpcTa7gWnvl+r4Uzjj/Zo7ewXZ7EWfMdiaYhPnFxsY18yLAPG5z74J6twSy8yHS0rw== 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=S0hTUP7BWfC6hR2qi0/oyeh3UArHUa4ewkVSrupcLXg=; b=Z7rPLuUInO0OAc3VlE7H31KLFnWM2QufHs4AnBecObuBpXDQqGZ2zaxc6+JeT0JU6T2vQLGdonXDfpahxY5HUGQDEzmbekBh9PxVR2Bes257K0+BxKZ5sA3e7WMvX/zv9TfCnOklOlN675qL1bi45KrDSJoayYic3xHgO7Uju7DI2HTdOybMGCe7DgHfMXQNjJlHxQ9qLl9SBSnxcYN2jKIanFHylNSc7fDH6Zxdg5SEzR8pAYEXzCSPWn2umk0K9d36aOOpOMoORZjbzrz8SIg/oUhxuJ3EQL0uUAokKtQttY5er+wuewuV97KHdRId6ysffuMKsepXLSDkuEEmVw== Received: from VI1EUR04FT026.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::4c) by VI1EUR04HT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::265) 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:58:43 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e0e::45) by VI1EUR04FT026.mail.protection.outlook.com (2a01:111:e400:7e0e::127) 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:58:43 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7495AAA6FB040C94421DDD2301869EC251AABA5E329EB8B75129B6BB9C385FD3; UpperCasedChecksum:FEBCA8C61773C4977A756EA288683E478BBD50D2E0F4AC50FADFCF9E8743DC68; SizeAsReceived:7171; 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:58:43 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:54:35 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [StVU6h51wRN2YFJ3tnxYSh3yucEwTO3D] X-ClientProxiedBy: AM0PR04CA0129.eurprd04.prod.outlook.com (2603:10a6:208:55::34) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045435.5175-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM0PR04CA0129.eurprd04.prod.outlook.com (2603:10a6:208:55::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:58:39 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8508c399-ac75-4a46-985a-08d95d4ddb25 X-MS-TrafficTypeDiagnostic: VI1EUR04HT053: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YTbLRwFaZWSJSZSN2ilu38pOW4OBrAuTecDO4D/UsNWWJKoOro4dOxc+SS1A1usvO16wYiYB37jEjfa58fDNO8oRnJIzjYeGNc23MzCq5WsTSZZxcGN9pHJjSS94+qk+m/2cau+7PN8oV2CKSjxZ3qjWwB2sZlc/HytOimCC/wux3e3MhQn2BTlQE6kz5VlMUO0v4qzvSg5wAw+Si3ZheBW89XR+lX5inWsbdYIreqNhiorjjlsEeyMDb/R8F7KE7gvTwHFS2Jv7QDtLviFgZeKgd9e7+rHIgv9pnk0yWi6DyfakUppU3w2ckFOu9Ttlr8h7rTJWuNwqHLlw4VGV27nlfF4P7uCgeKR7Ka/6k1OyAWVTgSHn4Uwrh3rZd1Gf2GA/RRKjygbgXTspVssQkiTfF8X+Q/4cQcAptNYRxDzwZO5ZXgNt5+dqtLuw9Cxj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hKwHt+ypPDgcBF4xvpvw2YRzuE38ghS/zdd89/RKXToc34qROlHvbflvA4E0Oc5QqrTQP4V/X9cbD/Sx1+7nuHojkXhR+Od2pUj6qoR/v6XP/WzVkm+BX9yqWYMChZm/FtxGQ9L0dQPoNKzTtSk1sw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8508c399-ac75-4a46-985a-08d95d4ddb25 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:58:43.7060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT026.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: VI1EUR04HT053 Subject: [FFmpeg-devel] [PATCH v1 09/10] return value check for init_get_bits in vaapi_mpeg2.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: PapiYGXZWVsp --- libavcodec/vaapi_mpeg2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 26e0cd827c..8e3903212a 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -136,9 +136,12 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer GetBitContext gb; uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset; int err; + int ret; /* Determine macroblock_offset */ - init_get_bits(&gb, buffer, 8 * size); + ret = init_get_bits8(&gb, buffer, size); + if (ret < 0 ) + return ret; if (get_bits_long(&gb, 32) >> 8 != 1) /* start code */ return AVERROR_INVALIDDATA; quantiser_scale_code = get_bits(&gb, 5); From patchwork Thu Aug 12 04:59:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp414905iod; Wed, 11 Aug 2021 21:59:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpYrVzIXkRwRN9IbNYL27t0ooOnn7XsFcKmG+hHRAlZP/6VqnGjtHXJ8xfCrV6g6KXtlC6 X-Received: by 2002:a17:907:94c6:: with SMTP id dn6mr1938509ejc.287.1628744378511; Wed, 11 Aug 2021 21:59:38 -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 ee28si1499688edb.265.2021.08.11.21.59.38; Wed, 11 Aug 2021 21:59:38 -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=jUoiTh6c; 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 4AE8768A412; Thu, 12 Aug 2021 07:59:36 +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-oln040092074103.outbound.protection.outlook.com [40.92.74.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43D5D680068 for ; Thu, 12 Aug 2021 07:59:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q0p0CwvKJ6zVsWk8UkV7QTQrfeygrimKMxlzlyg7dQouPsmt9RcLSuEZiY04ZdABj7ec4cfvHgMDWf5Y2Ys66mb+qKN9yVJGRJVOK5CrUiPWog4vRbJM6YZD3786nCwkHHdR+YxwwURdOvuEcCJB10Tg4V6gigyA4e8jQAiInOATz03wEYrbode2XwG+X2nRRDPIjGFmtyKBnnkeI0YVX713KAVLmxpnoX3wWM8n8mW1gUX9wzdL87vSqUZ1aq3+hv5A7Ob4vkX1sYhV/UeTYRdqNFJT4GxnChsrkLzztVa4aE8DEvea/mT9+Fd30nPHoEGcuHV167YAuATI+T9bGQ== 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=GSmJzfgmrV+PSsnHzX5NCs/YCn9Hiw2rD7HLKJHFrNo=; b=KZYiNMqt5MPjxnfzdrIUDkZ+9p5c+XMjABvkubNhyjwcJlM9DP879w7lBN0lEVvSDB62GH3lFIsOhMQPfRMSAmOPOawuGk65IN+Y3cOF/2Nunx1uiQ9/O/jdRt1br6NnZZwsvu5oczHDQV0kfOjZtf3zS3eAnbsxSUeB1RUMFlq/4n2TJD3lE3T1eQ2rDVxixDNsJbxfdinItOPjgPrRYRez+S7uayfJBtT6BVe1rp0REL1Q1blpk5cb+lwpFj3Yd2PHYJ3tsvUrIdu8Bc7KFkgc5bqJQUVZdI9RaGBZ+xhmeOSpuGZI8nfAEw/Ktc/hMU60RtrF4m6y+Nu/IZexRw== 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=GSmJzfgmrV+PSsnHzX5NCs/YCn9Hiw2rD7HLKJHFrNo=; b=jUoiTh6c1gmu8GV099/rkqdxeW/LK0Y2L7mmTWgMdlDzxiFATqGF5FdyTv+lkRRsJ+pFQMnknCTi+eRZIXdEnYeYhABhJvpqub6npBEDPIjt7gHXiFAGR3cujqEbL39nkXgw/SPlCCRVm0KTCSO+dZmw7bLvvLu0RMuX3bxqr3TI45k8lzmnK05Y2qSSrdTUuny+sVTdYeu8yJOo+i73SSkD0csAiZmDGQlVdDJ3g8QnLip8+UrZzHIbL3DrTve2f9V+dBVW90tjlI1sWUAc1WAHWhOuL+BrwnA5gUc0XG2LMAcqfkEylhFZbTJ5BmgkVFZ0ZZOnWXRzt+U6mbwmQA== Received: from VI1EUR04FT026.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::53) by VI1EUR04HT202.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::112) 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:59:29 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e0e::45) by VI1EUR04FT026.mail.protection.outlook.com (2a01:111:e400:7e0e::127) 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:59:29 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F8392D7BFCEBAB3769F3BE7FABA8C9113F3769E31E6B1A4FAEE40780F9D76DF1; UpperCasedChecksum:EB2DD45F2A7C3FC88BB241EACB75A3262BC8B51E2068BE27C0767BB3CB9C8E63; SizeAsReceived:7164; 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:59:29 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 00:59:17 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [5/Vo/S0+HTU8/yeUaOWKwb2JIyBumgt1] X-ClientProxiedBy: AM0PR03CA0058.eurprd03.prod.outlook.com (2603:10a6:208::35) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210812045917.5241-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.74.0.142) by AM0PR03CA0058.eurprd03.prod.outlook.com (2603:10a6:208::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Thu, 12 Aug 2021 04:59:28 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 19941293-0f20-42c9-3c1e-08d95d4df70d X-MS-TrafficTypeDiagnostic: VI1EUR04HT202: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6SY63fYhQpYnqhAraEsRph+rMaU+HsWJm9WURUuKh+ZwJGJMHIdEIvQm0QnwcZ3B/d4j/7ecNcjRjAuFbeTqVwLyK1m5PCzwFpZ5CBDPgrLtl5lXBLxrtM1AAtuIU4NFi2By2fL4UWccSrKDGhezySUUkpJ5gPZT8/JwPVsoyLK3pJqOmBjDGM/f+k+7hRhfFxgyHzn9otL2zbbm76KxL2kTk6Ml9tfuTXVBRE3wgbkSmuuOvG+IbJVnIEKs3LvWlkfFDmNCHvFIqZ2y8f8Bp+7gvkN61VLOpAi1Y6Jgr4OkF5HCEGhJjeyFUAgHFb9Z3w2OLCAHeGEbxpepyPixacTi3UayHmSNVRjm9xKqf2xPQU7xEuag4LhfdKyDAlR3GsK18cqR3Nl7Ssy9crXDbVJhZ+hjJ2gILh9JuPNcIg5wc3edljW8sKJOkaKuR9ju X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wzEmdOCuDnu44cawgIvw2DIY1TubjgIdVZBMq21YYbdoPOqBoRqmv3syWpCOuo3kY7nBf0UF3wzrGY3SAXQZc2m8gsn6X6yAjI29FY038t0ma5+CUE2Alfoey60wT2cshXz/QsnoekQz4vCPg9bgvg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19941293-0f20-42c9-3c1e-08d95d4df70d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 04:59:29.1098 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT026.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: VI1EUR04HT202 Subject: [FFmpeg-devel] [PATCH v1 10/10] return value check for init_get_bits in utvideodec.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: MdBtwkMwPy0r --- libavcodec/utvideodec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index b39d8a7948..144992ff0d 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -153,7 +153,9 @@ static int decode_plane10(UtvideoContext *c, int plane_no, c->bdsp.bswap_buf((uint32_t *) c->slice_bits, (uint32_t *)(src + slice_data_start + c->slices * 4), (slice_data_end - slice_data_start + 3) >> 2); - init_get_bits(&gb, c->slice_bits, slice_size * 8); + ret = init_get_bits8(&gb, c->slice_bits, slice_size); + if (ret < 0) + return ret; prev = 0x200; for (j = sstart; j < send; j++) { @@ -314,7 +316,9 @@ static int decode_plane(UtvideoContext *c, int plane_no, c->bdsp.bswap_buf((uint32_t *) c->slice_bits, (uint32_t *)(src + slice_data_start + c->slices * 4), (slice_data_end - slice_data_start + 3) >> 2); - init_get_bits(&gb, c->slice_bits, slice_size * 8); + ret = init_get_bits8(&gb, c->slice_bits, slice_size); + if (ret < 0) + return ret; prev = 0x80; for (j = sstart; j < send; j++) {