From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0C004469E1 for ; Wed, 2 Aug 2023 05:19:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FA3868ADCE; Wed, 2 Aug 2023 08:19:18 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2065.outbound.protection.outlook.com [40.92.49.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D09C68BCB6 for ; Wed, 2 Aug 2023 08:19:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LP+y9o7ekJx+2vFvekpcJkYijSdoa/+GH7Mr9yqxmYm80gRwEVtKI/Wl8wvYnTzvwb3hN7f4e9LP1JGTwTwfwOc8N24/N29MtvL4BpFMMCW4cM7hsew8f5VICjxNUWimPyOGo7bvYGIcBWDbkCBTL6uL1JV1OzR/gLVt0AbNckPLW1E9B6WthGobfZJbdt3vmB/5TgSnXbRkwCRGsuqWuux9wpRUW5n0TCtsBsVfZBP+gzUbdu4px9IPhlynJ6zaObbv98t+7W2QvP6EZexIzqRuot/VP6ElP7cEPT8vcE4fMXTKweO+r4kBYqbF0tpOgsilhlnjJNQL7IEAGpiG/Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=61pX+5JNx/0EdOL+IFsUo/UiJKVot8HmVC/R0TNvye8=; b=dR46F0sRhmbduCDd5heuwoR73jFWPjPwIE6G33S0QRAZoyXqiuVq5H2O57OeGXMb58nczc0nfNS911dRPSheLuq77Fdjr3nsVqHJJbUIsd+iR6z23UNfXB/G0xTRWAhl0FWDlZAtPniTQuD1IH3B8XbsTglvuK8ei9rjjKk/sOr9D4HlBKhqYoXNdwkZQhO/e8jF1L3DK3dY9LrvnGvcpuhBYBsk1FsBqWuXbodDZuA6rvUKRVfv2N8jq8b6hjACgjx0gZ7aMGQBHiLtfKkAWxpa/8S1sEF8dxm85FzRn3T2OypGRq0NvU/7wDCj0baLNPkvc1ZTxMno7kNGCcuQjw== 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=61pX+5JNx/0EdOL+IFsUo/UiJKVot8HmVC/R0TNvye8=; b=lYFaLOSUm0u/M2Ee7t3y0mLsGDYJ28otK/V6JOtYyCu5OM0UE18FGPEDoHOoO7yKo8p4D+4+IjD+dfmdoLe/eHCRPUsWI8voC3YNELzhuzBqC5Cq7njmvQF7GwcOEL6m7350C6xPXi+C2uoxmhy5/jzhg88DFBr83TmsY9jCV7Sfvpgoya02zHZ6oIHZTEn2GF0c8mEl9BoNBbb4VYxOBr7OkoCC+avZvNG8QiUIqZ9PXjs8HwdRwrA/9kLzZy/ObUXUo6zFATJYmdGwgEU/2Y567eJ7kPC+lBqYWBZKudvE+qhx6CnTNQ0KeZl7ewQez6sywNXS1sDoe7J+v9aE2g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0353.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 05:19:11 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 05:19:11 +0000 Message-ID: Date: Wed, 2 Aug 2023 07:20:23 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [O/g3FYvKq9w3ZYAFN4/rc6GgXcilknF6] X-ClientProxiedBy: ZR2P278CA0062.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0353:EE_ X-MS-Office365-Filtering-Correlation-Id: a24244c3-dd92-4710-b27f-08db931800fb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w/fC0sXhYSIztS35a2BBEoY9LLnXAe/CYDjr0LKJtxlACNmLz2RtjSoJm6AHTx2XpByZWOZrLQbXcgC0BxV80W3aRQql8F+ZZ5oF9um9QwJIuPz4QA9zIwNNB+Y1lYQEg57khY7uQ1TC+RGd8uKPNh7Ah2WFpnQCHs/ohNUrmrc1syWbRX1OB58YYOqp0a6x6zYVz/TOqY4yaQ03WyJ5SNgG9FsoZ225kzY9yMv6/HYrlR/2gF7fI94CCdm6oIY+ARNWXwbu//bV6lSAfQG2PDlCxncXFu5P+cKtpE5uB7CC/7cu/bafhDOfhgscTsJOlwXktiYaF/vP7/F2R2Tf9SoortRCCVao5cXXlrLCRXwXDI9x1Br7D7X3mQq267XBmHLJxoOfz9dR0kk+U4jz1EgL67akhqKPr1ZAXBc84DWnALTPdgyUJ0yaMp5NCE2amYOfDd3Qb90899cCdQ7KG0L5FdDjWFrpeBVC0bxEwSKV5bRR8wZ6P9M7IXpeMy4worDXyaowzNLTW2mjZx2sAptlV36vsw6WD94X2xKQz8Wv1SlojglNkMfSDJhHYTYK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?STN1VkhITjhaaXZ2VmZGUU9CdFRaZ01DRHZxU24yeGZibG8rSGx0V1NWajJw?= =?utf-8?B?STZMN1FiMTlBY0RHVE8rWGFpc2FSSzRHOHM2ck82OVAvVkpKTHR2MVFtTjAx?= =?utf-8?B?TXpLOVNRQlBuSmcrTXV6MFNUMTA1NnlBYjV6Ni9LekVCak5sc0sxbklmanBs?= =?utf-8?B?clNNV3dsUVJ0TXhJQkUwVHpRaEFETWhSVGJkbEp1S1lHOFk1NlZOMjA1OG9z?= =?utf-8?B?ZUtzdTFnV0lYV1dvRy9RSjhFMXZwb0xEWjJKV2pXVTFNRlB1TEFZR3oreStM?= =?utf-8?B?b1BJaGZVRVBLVnBmalN2Ukd4VTMyNStzcEpvTVlGZ0ZBcGpSUHV2dFNwcDBk?= =?utf-8?B?cE1NTE43Z3dobEFWbDg3RlREQ1llTEFmMlB4ZFRmZUNEREI2RTEreDZoTmFO?= =?utf-8?B?eTJPTXRQSUJwcnBkWUVDUkdzSzJtdVJIMVlNYStIUllZY21NWm1tRHZiMG1U?= =?utf-8?B?WkM3Y1JYOCt6aFd6MzM4T2Y0QlkvZ09yS0NKaDl3VHZIQWVJM1ltUVU4NEdQ?= =?utf-8?B?bkhTTWdkVGZmSWxFZFA5cjZNVlg2eVZXNmhKQmpOL1RsY1dPR0RhSUdsYjQw?= =?utf-8?B?RWVLSk5Kb1h0ZStyQ0tNcUh3c29QWDVQVEdvQ0pCSGNVTTBZVHNnbVNxbXEx?= =?utf-8?B?SGFFMEFCQ1N5L09FTjFTdmE5cVlnL25VUUs5QWt2NTVQc2dUMUhpK3djQ2lP?= =?utf-8?B?ZVdTcldxWmNUMGVxTi84VHZjUDh3MDFjT0VhSVBuVlRYdE9IOGpDUSt6TnVV?= =?utf-8?B?MWQ3c1NKR0E3WTFRK1hITUtHbDk2RDh3T21DY2Y5ZnBBNVVMOW51VEhHUFpW?= =?utf-8?B?MWJuenpxd0YybTJUVHJBQmxQVXV1YTluY1M3bWxuZHlyZStBQmNOKzdxWlpp?= =?utf-8?B?UlUvblE1dFBNVDdsako4OGJPaGJwOXlmNjBFVWhoNTFXc3JZNkMybUpGUzFC?= =?utf-8?B?T3ljSW4rUjArYy8vN0h5UmYwL1MyUms4QjFpQ2Z0UVZ0ZGpiZENBNkROdEpW?= =?utf-8?B?VDNqTmxXcEJBS2p1WmEyNFdTNW1JbHB4WEEya1RVQml2MVhKM0NqNXRUUmlu?= =?utf-8?B?T0FuTGVyUkM0cjZhMFAxc2JWU2lUakdmN2ZwNFRIWDN5MDZqbEdiRlV1bHBu?= =?utf-8?B?S3ZOVEpHbnpqVWVtSUZQWjNWNnF4STMwUzA5YVlCcTgwWE05N3liSlFNQXNk?= =?utf-8?B?Tzc1OU51NzUwbUhPUmdtZU16Z251YjgybHNDUzk0M01vYi9Wd1BvemRrTTZl?= =?utf-8?B?bTNua3pZa2sxZFBPWDUvWGV2ZC8vcytUckI3WUZZM2V6TG5Xb0t3N0tiZ2d3?= =?utf-8?B?NllsV3gxTnlyWHByQUpQZHluaGJFSlR4OTVFT2oyOXgvZFFVaDFaWllNZm1x?= =?utf-8?B?dHA3cFZwZFpZSjVNRW50OWJUbkovVXVxdkpWL3U3QU1pZkNkUFo5TGFFcG1u?= =?utf-8?B?WTFFallpZktoWGxCazYyeW11YSt3c3NYSkhDNEhFeG5USzEzbVgwdURiL2RF?= =?utf-8?B?djUxWnM3aXo0ODE4NnFla2F4SjlwYUtRYVY5UkNoU1BJSDBxUTBQUmVKVlVw?= =?utf-8?B?Qkx0dTNrcVRibnhlaUdCZnlXeXVFZVk5cW82MFhybzl4UlpXRmg1MFpnV3ox?= =?utf-8?B?cytHREU2Z1hXUTR5MTBuRW53b09EcHVGdVdIWkxwaUpmTXJoZU03WHpnaVZn?= =?utf-8?Q?NFkUHOxFCKq3VFe02D+H?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a24244c3-dd92-4710-b27f-08db931800fb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 05:19:11.0717 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0353 Subject: Re: [FFmpeg-devel] [PATCH 2/5] avformat/hls_sample_encryption: Always free AC3HeaderInfo on error 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > The code currently presumes that a return value of AVERROR(ENOMEM) > implies that ac3hdr could not be allocated, so it need not be freed. > Yet any avpriv_ac3_parse_header() might allocate more than the > AC3HeaderInfo internally (it doesn't currently), so simply free > it unconditionally. > > Fixes Coverity issues #1492870 and #1492868. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/hls_sample_encryption.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c > index 089662905b..d5b4c11b66 100644 > --- a/libavformat/hls_sample_encryption.c > +++ b/libavformat/hls_sample_encryption.c > @@ -105,8 +105,7 @@ int ff_hls_senc_parse_audio_setup_info(AVStream *st, HLSAudioSetupInfo *info) > > ret = avpriv_ac3_parse_header(&ac3hdr, info->setup_data, info->setup_data_length); > if (ret < 0) { > - if (ret != AVERROR(ENOMEM)) > - av_free(ac3hdr); > + av_free(ac3hdr); > return ret; > } > > @@ -317,8 +316,7 @@ static int get_next_ac3_eac3_sync_frame(CodecParserContext *ctx, AudioFrame *fra > > ret = avpriv_ac3_parse_header(&hdr, frame->data, ctx->buf_end - frame->data); > if (ret < 0) { > - if (ret != AVERROR(ENOMEM)) > - av_free(hdr); > + av_free(hdr); > return ret; > } > Will apply the rest of this patchset tomorrow unless there are objections. - Andreas _______________________________________________ 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".