From patchwork Mon Aug 30 04:05:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3603565iov; Sun, 29 Aug 2021 21:06:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwvbRnJutgy6jyz4myjDDwxtjn5Is3UFai59I6G/Z0e5t3tT6RhvZk6HFqKZ4/qWLr1BP2 X-Received: by 2002:aa7:d487:: with SMTP id b7mr21920589edr.61.1630296382596; Sun, 29 Aug 2021 21:06:22 -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 p1si13704584ejm.169.2021.08.29.21.06.22; Sun, 29 Aug 2021 21:06:22 -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=gtYp5Kl3; 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 392C9689AA0; Mon, 30 Aug 2021 07:06:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [40.92.90.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BA0A680394 for ; Mon, 30 Aug 2021 07:06:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E+ofKky9rHhihidyitYtGKJ6str0aJKmaMEDfTcwUKjC9+ddz+H1CIn/l2QyCxOMI6Va29c+uWx1EAbEl/8V26W25dt8xJVek16Y8M/jdlpD7okxyM4whpkHACTBGeVnUzhe9k4IRowC6/FTgX5RgbY2ZTfaZaxBER+LXEbRPvYAQOLVYYCLSn4YhzxHCsSltyYp2VRbBiAVuVDPG1YBn5+GcQxk0HAuGdLFzRIMU6d6Dh+0q0TaxYxUVmismRvY+v9JUiQv9r68FHvP4xoI2jccRvVn102aWgizIbvs65OJClk2kOeXO7xik4s82Yao7uRhz5PNTjoYVDod9Zf8Mw== 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=qU7sIiB9wS6s4OImFq/VxxDAL5zx8gmT7UT1m+PeFF4=; b=ZrbScVy5jkhm+sGjAyIB0i0Mu7Tg31mA4DDk720XX68Qr9q0yRKkx4gO0pyljqsrW7xgabo6L4zg1wRBG6UZEmnIbtxgE95omle23oIqUTIiFTP761Kfv33ub/oB2j73rrelzHZUX7FZ9iIGL1jEXF0H+ogb3/o6oOHFzoJqtFKMaBthLrkmDZWAnTx11POrupoMbg8e1Bg17PfZg9XLmzd9FEbPfHJepHe1E3v9ML7AqWGQlz7eWADinJzlqhDzGiJ0PTQU0XkhQDkmGwvxdbhc8aWZJPct2nEFBFsXxRtL73XBhty8Ez3bkuMbBCFg5ppfZFnkx4IDgutBeDXm5w== 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=qU7sIiB9wS6s4OImFq/VxxDAL5zx8gmT7UT1m+PeFF4=; b=gtYp5Kl39C/5JSxtdS5lxJmYogN2jk74fHnFehlvk1LTBPWzFJw0/G5H4Gk5vMnPeOU4ZowTwyt6rQW14lx2uFhZ/fuhkQ+VSoRbu2QB7NI0yKpmkGTw8jDJamoF3VamWPdVJQ7f/KKKWA4BszH0DUS90TxUzwH8c68CLutXYZ0XR4Se1Kbm1TgK7U/v867/+w2n6ZrHi/aApHzcH23Q0JXPgwS6JTqjcQUWoZA0gPdYH7BvZlho2Q+efqVwEhNdqQA61mkc6e1yvptmfsO5jHm9gLr+ZddkzyRHwpKV3uP4WESndfqBkuktFmHZeEOvlFQt72lODaRCzAdbvwYk/g== Received: from VI1EUR05FT050.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::43) by VI1EUR05HT015.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc12::448) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Mon, 30 Aug 2021 04:06:11 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:fc12::4c) by VI1EUR05FT050.mail.protection.outlook.com (2a01:111:e400:fc12::291) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17 via Frontend Transport; Mon, 30 Aug 2021 04:06:11 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C0714F96C8EA8884CBC11D2D3489AD8E81DF8C13A26204C5B9880EA4311BA191; UpperCasedChecksum:D3B88A5608864F000D830C4E4C155457020AC0252009C1A5F30C9FB0848F179D; SizeAsReceived:7173; Count:43 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::6c91:6298:dcbf:4a3b]) by PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::6c91:6298:dcbf:4a3b%5]) with mapi id 15.20.4457.024; Mon, 30 Aug 2021 04:06:11 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Aug 2021 00:05:59 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [G8UN+wjCyAA1r72J1xIriLBV3IjG40g5] X-ClientProxiedBy: AM3PR03CA0076.eurprd03.prod.outlook.com (2603:10a6:207:5::34) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210830040559.2609-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2.191.135.98) by AM3PR03CA0076.eurprd03.prod.outlook.com (2603:10a6:207:5::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.20 via Frontend Transport; Mon, 30 Aug 2021 04:06:10 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 25423c94-1189-4f66-d311-08d96b6b8083 X-MS-TrafficTypeDiagnostic: VI1EUR05HT015: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6oaQ2/OyRsifQ6GGz+0jKYwU51OdcBsPexaiG5b8Sd98+8gFeaNhDIcHknTrP0BhfKCtExRAf5OE1FzlxalnSOH84S68Eysy1ptAT0gqPXgPdPrVwvMgVox4T5HkATv9ymGSrQPkreaDpHwKmFSnCGu0TwoY5tltq2zBC5DuIHN5zlqUTK7fx4E7Dm6E1reYVgVJQ+vk1etlr3CuAdTtNPr1CsUYZ8WMh2ULSu3dzIwV5pQt0hFVe+rAfjiRRkc4rlwDVKpDiuB/ZLHvQyTCyq+gVRmFTCRbhDaW0J1mVbq2PxQlTNY3Is8xt636ZANLrif3q322KyS7D31G17qfBaxA7+RmyDL08j0Pj65THONCXWYs7aWDiOcmLkUJvzlCU1xq9zCQPVNwmEuvJH3p5ueRhOAU3uph0iRPgxcrYMtqVOIH1KxgHVRdiJpCts2w X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1Ftv6T9bGetogvekezyQgYAnmeTaJ8e7A14TROOyOraz/pXc5QkXGVy9YjtWSHgNeGEKrhPLaRahF7qTfFfvheqqecuVMU7MSVgtGw8lTWrguc/3y0t4jdDYAaY7QQp1fdd9lCHVo8M+B6WLaca3UA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25423c94-1189-4f66-d311-08d96b6b8083 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2021 04:06:11.4527 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT050.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: VI1EUR05HT015 Subject: [FFmpeg-devel] [PATCH v1 1/1] avcodec/vorbisdec: Return value check for init_get_bits 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: KrZXEtSOnimH avcodec/vorbisdec: Return value check for init_get_bits As the second argument for init_get_bits can be crafted, a return value check for this function call is necessary. Also replace init_get_bits with init_get_bits8. --- 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");