[FFmpeg-devel,v2,1/1] return value check for init_get_bits in adts_decode_extradata
| Message ID | AS8P193MB12542A86E22F8207EC971930B6F19@AS8P193MB1254.EURP193.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 |
| Headers |
Delivered-To: ffmpegpatchwork2@gmail.com
Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3681630ioh;
Wed, 4 Aug 2021 13:16:00 -0700 (PDT)
X-Google-Smtp-Source:
ABdhPJwT9NFqvFRdm6neE0lizU0SEmLVQAHefkig7iTOz+5ApHMNOreD7HdqD9aH32XJq1T4q0qj
X-Received: by 2002:aa7:c98f:: with SMTP id c15mr1761260edt.286.1628108159886;
Wed, 04 Aug 2021 13:15:59 -0700 (PDT)
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100])
by mx.google.com with ESMTP id v5si3445076edl.215.2021.08.04.13.15.42;
Wed, 04 Aug 2021 13:15:59 -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=YNGs4YlK;
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 3EEC0689F3A;
Wed, 4 Aug 2021 23:15:39 +0300 (EEST)
X-Original-To: ffmpeg-devel@ffmpeg.org
Delivered-To: ffmpeg-devel@ffmpeg.org
Received: from EUR04-VI1-obe.outbound.protection.outlook.com
(mail-oln040092075019.outbound.protection.outlook.com [40.92.75.19])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AAF2680C54
for <ffmpeg-devel@ffmpeg.org>; Wed, 4 Aug 2021 23:15:32 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=SLzvLlpYA+PnGPttA13MxGKY6vyZGZgOtMsY8B24mrfg1YO32VcCm40zhfC2HuLcqfZNHFMO906iJ75V7xcH7SlDc0mbaFzqJVr1jWJmI/IQHnF0U4JxJS2Shlxpm7tF7Izqj1ObnqdZBnor+uacdjVKgZxaZvzT51w2sx2oLiWiLMtuT+PryqDIX0ffrWmRwqoU4AeA7ufDJddvSp52boqOVaU9cLXh7xiENF89BOovX/GwNVkzrogE9lKcxcFnSnWkPQf13lUEjfha7Y8Zp/MQrIx4vY4cfNuEqi2l/RKdCyEBemDd9v+aalilk9GcgF014u4Ns/K+dAEw2wdI8w==
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=55BfsT2VUJOK3j+wwVcQsvDbdRVZv8frn5/beU7RHpE=;
b=EQEOpWGoi+4NGcNd6vPxSwMEqRcjxnRftKrMwAJH8KaWEX2Iu4KoCaT1agll56Xnvx2Kd0bSYcogm1dVkHgYBYQaQ+hY7vl6dgGdBy7iJUPFTEhJ7aW1Q66v0lIRPkb7sRsqbqSgPRr421Tj0vvjwzfTfdPemaegGiwaPgkFw+0CrLcLUc+m+Spu8L2tuYzp4jJ7a3ThOHnqWtHnNaG0CPQIg9GYqeKv6qSN1/cOa6BuRmrn0b0ySCn4clomKzGdv/f7oBBQvsUmmPiVs9nUulXKG4UY/D6WQfsvhyJG9GEmaB/rwRaRlSCbJq2DYKqX+R1ac2nIvoZqnrDce+pThg==
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=55BfsT2VUJOK3j+wwVcQsvDbdRVZv8frn5/beU7RHpE=;
b=YNGs4YlKB+AtQwlIUiZWMcijg5W6FXsDDa/O9zRdmMf42mSflz/gH2U6wwuxHIZ8510+shwq4CuvIcM76oAQUKMJwuxqE3HNlh75amacd658V/cekmVNwtcWfQGaisEOISkrQuxHPL2m6W2NsSXoRjIU6EuuaELzfRY8WxuJifHzOaXUExqRQ3lUb2ZAbqYCfLEynuGmQAl8fr01bWK4wK+ifS2iTehDxAFYey7/PQvS2/WfXkKvqtv3DnvT/9dCHra7m9PLZm5HPmttsAOaICKs3q4VARWQDOA4nULjmWMYRogBH0vYHwfJXI12+SLW9pQ6savYK9NMRhFmAl6QNA==
Received: from HE1EUR04FT052.eop-eur04.prod.protection.outlook.com
(2a01:111:e400:7e0d::4e) by
HE1EUR04HT193.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::145)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Wed, 4 Aug
2021 20:15:31 +0000
Received: from AS8P193MB1254.EURP193.PROD.OUTLOOK.COM (2a01:111:e400:7e0d::47)
by HE1EUR04FT052.mail.protection.outlook.com
(2a01:111:e400:7e0d::297) 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:15:31 +0000
X-IncomingTopHeaderMarker:
OriginalChecksum:C66D7B73EB07BE1B299C81993060CE64028B3B73C4F68B1726F01A2AA81B9380;
UpperCasedChecksum:11C6EEA9555579D21BCF50040D3DE23BD64298D2165D740C65BFA2E88CE0A142;
SizeAsReceived:7190; 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:15:31 +0000
From: maryam ebrahimzadeh <me22bee@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 4 Aug 2021 16:15:18 -0400
Message-ID:
<AS8P193MB12542A86E22F8207EC971930B6F19@AS8P193MB1254.EURP193.PROD.OUTLOOK.COM>
X-Mailer: git-send-email 2.17.1
X-TMN: [j8TX5P8Gn1/zHKQHoGSw3ApsRdClfJGr]
X-ClientProxiedBy: AM0PR01CA0147.eurprd01.prod.exchangelabs.com
(2603:10a6:208:aa::16) To AS8P193MB1254.EURP193.PROD.OUTLOOK.COM
(2603:10a6:20b:33c::9)
X-Microsoft-Original-Message-ID: <20210804201518.2667-1-me22bee@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (5.239.90.196) by
AM0PR01CA0147.eurprd01.prod.exchangelabs.com (2603:10a6:208:aa::16) 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:15:30 +0000
X-MS-PublicTrafficType: Email
X-IncomingHeaderCount: 43
X-EOPAttributedMessage: 0
X-MS-Office365-Filtering-Correlation-Id: 96b7dd18-0483-465b-1f4f-08d957849be6
X-MS-TrafficTypeDiagnostic: HE1EUR04HT193:
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
bcxRM8ryv1Ay8dxu2fDSDL3B18JwRqB96WHlpIuYh0IOSIqeoEjR4lQFLhkkkiM5MIjHXISbze4Fwm0T46GaJDM+HRnjPzpDfc78KHShG4HB5NbA5d+N6m96KFkgUsgXQ5u7FyLCNHoX2dnJLctxm5vnx1EtQzriMchqkEDbFzP3kMB2iq3RwUaXaGRPKPW8jPC/P7cimpdEMjwp7cXECsMMTEyUq6jwMAs751LW8JF73NmsNE6T1q937SXrUbsx7KpgNu5fT2+bQ07iEAxXYWxiQfXLdFdN43T8BTyQ1y4kfobi2KXJqQDQLXTvfZTIoKW1wDc5KGgdylyEzb4672A1vUqmI9h0iBmJmAZC0cseLHbirSKCGEAM3RpLlRkZGcdqO2wx2R13bUmcBcipD9GtvyXjVRy4E7Wo3UqwYDu8qC0co3pZJFlSmkjDzDEX
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
hQzAxf2VNak+I2kMiloXi0JYp9mesnFbrf/IlLIkxF9jfjx7agknSV9ja2P48Bct95aEB8W8bDsc1YBHwr8AUGiqibguZrLTnMUMcYmRXSTeNcqdZZsruBnvZgdupnyXPI1Bz04BY8jLRN20lS37SA==
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id:
96b7dd18-0483-465b-1f4f-08d957849be6
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2021 20:15:31.6567 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-AuthSource:
HE1EUR04FT052.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: HE1EUR04HT193
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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
X-TUID: KvmmbwuIITIM
|
| Series |
[FFmpeg-devel,v2,1/1] return value check for init_get_bits in adts_decode_extradata
|
|
Checks
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
Commit Message
Maryam Ebrahimzadeh
Aug. 4, 2021, 8:15 p.m. UTC
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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Comments
Ping. > On Aug 5, 2021, at 12:45 AM, maryam ebrahimzadeh <me22bee@outlook.com> wrote: > > 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 | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c > index ba15c0a724..3924e678d9 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_bits8(&gb, buf, size); > + if (ret < 0) > + return ret; > off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s); > if (off < 0) > return off; > -- > 2.17.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Thu, Aug 05, 2021 at 11:06:00AM +0000, Maryam Ebrahimzadeh wrote: > Ping. > > > On Aug 5, 2021, at 12:45 AM, maryam ebrahimzadeh <me22bee@outlook.com> wrote: > > > > 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 | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) will apply thx [...]
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index ba15c0a724..3924e678d9 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_bits8(&gb, buf, size); + if (ret < 0) + return ret; off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s); if (off < 0) return off;