From patchwork Wed Aug 4 20:08:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3677249ioh; Wed, 4 Aug 2021 13:09:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZjkkzaWm6knT0OSoM6cOqnS5twWdyR/Fi1qAkHyddgIB2ThneUD39GbbbYxDa1cyuiddM X-Received: by 2002:a05:6402:358d:: with SMTP id y13mr1795415edc.80.1628107760907; Wed, 04 Aug 2021 13:09:20 -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 l1si2979112ejz.748.2021.08.04.13.09.20; Wed, 04 Aug 2021 13:09:20 -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=R9cYm1E8; 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 87880689F02; Wed, 4 Aug 2021 23:09:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066036.outbound.protection.outlook.com [40.92.66.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D612E68995F for ; Wed, 4 Aug 2021 23:09:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fF438amDk5Y8SQUd/lnMcM+iWP0Sb8NnusBOLFH/Ju/382bhza3J/DPh83kJQ1c/dU0kCpwmmG5DlBVIcYDejOF1ezIIyIBxV/pjlfIXyVzuFlXJ1VtQPyT4qU8dRu9e1YQBzJFihO5NS6eRv262e9vNPKESnHotL9pfrfJvOa+G26bAiKLJZ0vvL8hguVmslKMfWFx0FXA1VYv+X7ixM2xqDdsCaOXbR6Zqjw661LRltIm3FFGJa74O08Q8SiWWbUc99QtdDEAs1CfSgVMnhmpWZ3B9eunpSJCT27SBeAn1/mGNzETY07SOlQ0KH/PKufClTavs6mqhWJseqVhLKQ== 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=UOb/wpq7FBJPbrQWa53DswfvRZl3EqT9+KQTydUBEUw=; b=VmoHkK43j7/Jlyk4+Le6cpxZPpTmqhefRbS3SQZADkL4xzl+cW0ToXg+HP9nRIX9YJxBvZTlrrBoQKJ4tWs8Zdb2YA9azGUzjfN8Sr0PBd+XVBqwXm9OvvtZHX6D+13nW0QEPgdN6wLZSzpLb2R3I+9cwmomX4UudnK9WepiI8Xd1MeV/ibLTo8EJyz56h1BZDvfR6MpxcOcsuEtn928lukspLPidYgkVlfQCvK1Ira0Z02oxKAwmEWBYMZQrz5g+P/fLWSWXqstI9K/9mP8oklTZ2e2vMFLS8BpGiCWzHrAKRGEb5AsHmwtMcsE0vy5FbRZ8t4qihr5VNf/cMZsvQ== 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=UOb/wpq7FBJPbrQWa53DswfvRZl3EqT9+KQTydUBEUw=; b=R9cYm1E87BPpx4KbibzI4VBIOVbJzhkFvaiT2DznWd8lCgswTJbXcllOK++OyjHVazxxvNVCqzlV6uQMfdY+4NEcP0diYBkeKUp/rYgsctb7/8FsRP+CVRkuKi2mC04dGnmp8jPWVHhf1hQV/M5imyaSrUBzlwlAX4j/l05cRb8l3QMET+xIU2j19GYH7TEY5KFHZpmF4LwWZ89nDSeaf6GBsBzX43N7Yq/WWAjZaOYAGhZDbTbqqNonJGiiOv3KGw1xxwNo0EZlj0DdO7hGhyIRPDfJYEqRLgUB+A9cFy+rLJGfAqfkZaVZwja8oB3zVazDOJexR8f6Bmych/BDTw== Received: from DB5EUR01FT037.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::51) by DB5EUR01HT135.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::330) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16; Wed, 4 Aug 2021 20:09:08 +0000 Received: from AS8P193MB1254.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e1a::40) by DB5EUR01FT037.mail.protection.outlook.com (2a01:111:e400:7e1a::212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Wed, 4 Aug 2021 20:09:08 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6483964D03C033DEEA7F1A64187175B7E02499C2893A62DE201E60B64DD04696; UpperCasedChecksum:AAE51899A8C0DD5B269AC4E29500062F426BEEF739D095A195198B961B8C50C3; SizeAsReceived:7187; Count:43 Received: from AS8P193MB1254.EURP193.PROD.OUTLOOK.COM ([fe80::a0d3:ea41:c56c:9066]) by AS8P193MB1254.EURP193.PROD.OUTLOOK.COM ([fe80::a0d3:ea41:c56c:9066%7]) with mapi id 15.20.4373.026; Wed, 4 Aug 2021 20:09:08 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 16:08:53 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [H0vb0XSVAIA7xDAao/hnBhBb6zDFQRFV] X-ClientProxiedBy: PR0P264CA0080.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::20) To AS8P193MB1254.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:33c::9) X-Microsoft-Original-Message-ID: <20210804200853.2218-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.239.90.196) by PR0P264CA0080.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16 via Frontend Transport; Wed, 4 Aug 2021 20:09:06 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 603f8348-08be-4d84-b687-08d95783b721 X-MS-TrafficTypeDiagnostic: DB5EUR01HT135: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VVmib5t4ENxKoysF2nlo0CEAkl3wXLnd954Fov/9EQ2E4gpUOUi9RmzSoXKB6XUv4MZfSRXqvfqCthVVsBzTCk8/QNgpW7Kg+JzSXi7aKBqAlUl4bgvemOZPZoEojvSQbECymN23VRqya9y4elOHpBKXql7xdZU+LYhYsSwWoPouQdbpbHj1iSZezMC3BALbkIrrTrq7o0v9CADjZ3FrN8JKUBIqUyn7vJMrbh0CH4czX9Lx5ykllICrsVnDggdc+PwndMs2A37fQQkxzWuWeq5nKqRYap8DlFqeABYGMCTBbRnTxWqtcMzyE+Fu3ql+GPukZCc1I+1sHPJ7pDnQ+ii9ZVUbDsYyohygIH74btXUO0UrhFiiVpwJWjSuVmXzJabsokLbr0u+JhPryBY5BwPsNEysTDNOaiPWb/gmnqXx8DxaPpKzJnTVQSjne9pz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vXTOn8zc8wE9jwnQbOxJhOStmkfH6qz3+S734HHhkv3L8yW36cWz11mUaQLh5zLA+NaqqtnhB5mQ2KDRu/nBg8uFnpooBFMtyAB4YZT4HLG+HokacM9SlHCl5fGnZvjAYGbXvwr5LoVwCDA2GeRUqg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 603f8348-08be-4d84-b687-08d95783b721 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2021 20:09:07.9455 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT037.eop-EUR01.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: DB5EUR01HT135 Subject: [FFmpeg-devel] [PATCH v2 1/1] return value check for init_get_bits in adts_decode_extradata 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: kkmAJAC+eGEo version2: As second argument for init_get_bits (buf) can be crafted, return value check for this function call is necessary. 'buf' is part of 'AVPacket pkt'. replace init_get_bits with init_get_bits8. --- libavformat/adtsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index b660618432..3924e678d9 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -55,7 +55,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui MPEG4AudioConfig m4ac; int off, ret; - ret = init_get_bits(&gb, buf, size * 8); + ret = init_get_bits8(&gb, buf, size); if (ret < 0) return ret; off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s);