From patchwork Tue Aug 3 07:28:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maryam Ebrahimzadeh X-Patchwork-Id: 29214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2240801ioh; Tue, 3 Aug 2021 00:29:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZNfYSCsKeKhGgN09FQ3qCVxybGqiwCMot2gi/9MwsDqsmKZpzhZZ92zt0dMx98saFXUMK X-Received: by 2002:a17:906:2bdb:: with SMTP id n27mr19587995ejg.312.1627975748602; Tue, 03 Aug 2021 00:29:08 -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 a19si12291538edr.384.2021.08.03.00.29.07; Tue, 03 Aug 2021 00:29:08 -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=mDDoSrbI; 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 92E30689DC8; Tue, 3 Aug 2021 10:29:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067062.outbound.protection.outlook.com [40.92.67.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F9A96805B8 for ; Tue, 3 Aug 2021 10:28:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mzYBItWbR1v1Qw4+tViqgjN2/CJXZTMfpCwdjxy2P0kAcN8D4arsykPHOUj8cxcM3w+4QOBtxitbYxmEeqSq1mk3l5RAqPHnYKrSqCahKA61MMLzaNREmXOJGKTDuhxZKCpgCUojNgFsEeJA84rRL20VEMpVovHX5e6icDzXyEJ5P0E829TYwkeXwdgDrRrItGYcX+oXkPfjYli98z+//Jc/+ZyVEhd7WbVy0KcWQ6Y2WoCBpuO17lUQNyEcjdhMbFUHmOynG+girrNbFysoGl0gKGUchiypMvymb2wKdDM1sW3I9vlLRfNWHNdwkYD8bEYUdMA9Wpmr+I82wweeTw== 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=ycXDjR+sj+xxVLsyz4NNNnbYpaqALoSNyEZGLUIoUk0=; b=J/ZFQMdeXdikizYCrppJmBFD1aIfzAy0wLTn6oyOeWYtVwSlZWPOsGayi3FyBCZ8XZ5NUdO6WxCC8BirVVP8csp92MyFs2IaUItFBhc0KiEyOfMGWGOSQtxCHLLs5mPZsHxod9bsOoyGwsgOLJHmlvFotRy3V6GWQYa+12IWHnVSHRkNL5LMBmTcDYfzSLhoMu9LivZmYud+EUQWzQd86IAddmQKdcQcnYKOxYeEmZrMwDKWIyV8BrmxryKGZbtp4d5QHyz7Kitl/327hCFWUNUzRWuqJPxBKpkSsHk6oVqT+T3xqpXNcN7OdGizHKGTSzcHPlfaYuauEDdzJqR8BA== 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=ycXDjR+sj+xxVLsyz4NNNnbYpaqALoSNyEZGLUIoUk0=; b=mDDoSrbI4jEuy7gra3U224tWoBphKBorufCGosowIyZfNMYBaWHjAUQIQWThbE97gOKQUUE1NzMIaABhMrI7lLNzBLbZJREdf3moqrmsdxKz23Itxo4N8crgv1V66lHnRnVUOb1d/GEAbFPK7vXQvyavm+EbOTmgTqVy55YuNJBZuBPJMQudWQ1j68wEKQDhP3Jyb6dgDblc45pCQmx5hLfpH5ohaWNzu3zhrcyDF2gUd9XSiXmtjqpX6exoHEqRKqxIWmp/SJQ+xaOjbHnsxR6shMUmBmfQ4R8f02FDe4uWxFkS+yhI27kSYeETrMaA+VDDLBxmXK25G0fRTQPByQ== Received: from AM5EUR02FT047.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::50) by AM5EUR02HT122.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::443) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Tue, 3 Aug 2021 07:28:56 +0000 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e1c::44) by AM5EUR02FT047.mail.protection.outlook.com (2a01:111:e400:7e1c::453) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Tue, 3 Aug 2021 07:28:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:53571FAE74F79D0017123081BA66845959123A806EFA5F3403E61799D695FE91; UpperCasedChecksum:7BB1B969CBD5ECE545AC05A3C99D3978FF87FC7F086D5A0BEA9C9AC1FB3044F7; SizeAsReceived:7182; Count:43 Received: from PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::f028:bc73:e6d5:29f7]) by PAXP193MB1262.EURP193.PROD.OUTLOOK.COM ([fe80::f028:bc73:e6d5:29f7%5]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 07:28:56 +0000 From: maryam ebrahimzadeh To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Aug 2021 03:28:42 -0400 Message-ID: X-Mailer: git-send-email 2.17.1 X-TMN: [C4Q3Gwi0w+XdVkKfzDKd5V9N/RaQdNtI] X-ClientProxiedBy: PR3P250CA0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:57::27) To PAXP193MB1262.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:dc::5) X-Microsoft-Original-Message-ID: <20210803072842.2152-1-me22bee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (5.239.27.72) by PR3P250CA0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:57::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Tue, 3 Aug 2021 07:28:55 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 43 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 49c44b9a-8bd8-4d59-58ae-08d9565059e2 X-MS-TrafficTypeDiagnostic: AM5EUR02HT122: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CiBRfWldebVm1xA7BBx0o4AcEbuNKsCMkbLE4oauVp8sfqKCk9/3aUVeVgrM/303yHGiXvCZ+DMJ9AR/J91hm9429deCbYuW+ErjEhMkuDm4FzRDaTWbyrx6HYIx88uR/0zz5CMsc9PanOHaHuszWAToMUlf+jppGxMIKb5qvXrcY9J8jpM2/VjFvWKeu0U10wZOXP6SIUbcTdnBt4Fyt08lnoZwV0FDxggF8awbbW97JMILV+9jVSv7jqGJm1GGU+P7oT1xTNS+5Tnuza1WLm+xsbqg6PsEv01pMFuTCdiqDQsc3dYKRgIq/bEd5iAXZP7B0d2oow0Pr6JO3JHIpQOFg60Na0h2+DD0X/WS5/K6aMxrCZLS88BJtQYsqgaZWwlqUi1ULspWYmeWT91cS5fnZxubRS2iyafQ95x/luCqDM/znYuiQxDjCtsejs/z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BFoeABAuXSHBHu4ka8F1uaijN96y4VewZw8P1FEnsgWlbH0rx/RrRvHxFuX1txVHM2WzG+oQ8GcMTAVNdoozt9OaJp7QBGrZvhbu/Hg7Y4cm98mn11M0N3/HcB4R7vRESHO4vpw22cbPLwynw8R1YQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49c44b9a-8bd8-4d59-58ae-08d9565059e2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 07:28:55.9066 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT047.eop-EUR02.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: AM5EUR02HT122 Subject: [FFmpeg-devel] [PATCH v1 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: /yN+9WG8D1DA 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'. --- libavformat/adtsenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index ba15c0a724..b660618432 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -53,9 +53,11 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui GetBitContext gb; PutBitContext pb; MPEG4AudioConfig m4ac; - int off; + int off, ret; - init_get_bits(&gb, buf, size * 8); + ret = init_get_bits(&gb, buf, size * 8); + if (ret < 0) + return ret; off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s); if (off < 0) return off;