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 06AE5466C1 for ; Mon, 31 Jul 2023 11:12:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB37E68C550; Mon, 31 Jul 2023 14:12:40 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2048.outbound.protection.outlook.com [40.92.91.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1616C68C064 for ; Mon, 31 Jul 2023 14:12:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CD6jhyr9rq/RaFcddhOlbnCT4x+lon0bn2WQByHDVUHpMTiyOqu7rgpr5GkYEDHNkOG6Elap8Plcy9VaoIn0BJF1vmpL4rYORr243ggDPhoZCfAtZbat+1inmfwzv49Hy+edSXQSM2HcAPGE3DaYOTNvz2wVvW4ApF0Df0BrdxcSkBMnEMh9y9reYDMkDIUf+4gs2msD4OxMAi7Tt0kyV91UsUp9F0dvCnysMTNb7EkW1UEn5b0mG0Ixn1WASmFv03uK9eoGPPcmHBQACO6RByHhHZybnOZmrXaT/inBoayLRoFAbpokwHixgIYHOBgoCGOap31G6rGsz0X2s7s25w== 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=DbTZYu1hp6PbpCiTe0B5+lf9IKUKPFNWmMT+z136jUY=; b=N06y+ZYgxLo0qrg4yiyIEGy5GaDlce1sylFoHV8MsXRz2zzl2l1QKhYP1r6838DAovr42SIJ3SM9HFKeT2NbtyDoV1CHyvH3r0FEA32vVA6mnwKl2oBmr9AhJcXunkCmVBXwTmTf6slQ2/TYg8cZyk8uAqNx9Bp23CHCB3Q4JGI2lGwyeA3WWuTzDELT+RHWbB6jl7P9xZu4d5F1/8RsixtJqnN4grqw1CvLgCBeL2L4yqwjOdFXRJdAVOL9ZUa/XWesRYnbjyiZyd5PdZBVQugnP8CgEP0QEV3+Zjv+lG/1abd+t1hEOi6B8XWhmffed3P7KDOPwFma37Pq3/S/3A== 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=DbTZYu1hp6PbpCiTe0B5+lf9IKUKPFNWmMT+z136jUY=; b=CbK89LYGn97/H0k2lS95t1+GhRqxVKAi9X/gia6zoqpLY/cnGyy7DEOylitmDxtK9ZnXXK66j4gFfYvzHTTBVZ6z0G1jBuRkTNJx7JQ/ZGk23+wgF4XdboCn+vDM73hk5C49btQf85bvQrEfzJJxI5XiHMg2dyz/Y4sUQYtktGJnhoA5pFHhUw3sLasl3z8cM/fWqwVd9ZUbYbbUZNOyZhJmAbwPaZn9tqgnM70Oqy88IXMxnmMpwhk/VvozlQfY+aoXJ1lj+q4NHJJk9IBq1uBinUsM8TNE+SYLsgxyE8jgAqQIQSqsBgty11fxKxQPBPugPtPGyZkPd8jO1MwZeA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0271.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Mon, 31 Jul 2023 11:12:32 +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.042; Mon, 31 Jul 2023 11:12:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2023 13:13:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [G5sVSM5ZX6VjJbaKGM0i+t97geOMQfwDtujG3OVZTFo=] X-ClientProxiedBy: ZR0P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230731111335.3313288-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0271:EE_ X-MS-Office365-Filtering-Correlation-Id: 182d154d-c849-40a4-6d20-08db91b7093e X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mx9fBRSAKc56BNWAqVH+W/bkYzuE7n/zbeFjCPnxZ4WGw6NZ/Nf0RPN4bzw+YZbuYp/6NyZ0EY3703t1W31RlIfRF4pAihK1Pgj8d9tVeIGijyzYMdKlk3CHpPL1S+IlFcnTvxtyb4BBwZMmc9iBJK6m89WDBQZJtax1GzlhtT6+dkCOyUts9/cGKh1l4BP7ZwKKQ31Y1gJ8B0i8SGczTwu1kQX+HyoZlJ5CD+DcOqw3w/a/e/X4mc/Jsjyq3CwyiNSNTfreRtAV1OJtyTQ8KhUXQO9HQO+6B+JELtPdy9JDORmdGhrKa79lgAIjpNnQ4PueCQfXEGcXNKO/iPiyWLqAOS80SFMeejlZ0QyH9zruhdTfwWXCTY0I6XgSvf4ngsWAr9V1JXb5+FmaRu66WN+4lfYiNnK/brCuQP/tv86wCnHNa38shjYx6BJs3xnMrFBp8ZAWr/g6DtXnGLHpMc32Gxw+sVMIrVfRqRkTGhES2nyYz3nn8SyNxG5QXK4i3L8I8AnjltHFB1xkvzIksJL9tKZ9Vh/oDkph3ZkykgwKb1x2DXtLDbikwRKk6EVOcJYXIxr8WDYv/+Asrxe4XpnnmYDxeKzSQ5gHV0t80Qt+C9RW07AxeK1ok2ls4RquHAmkcOBVA+wN3nsGzopkaZ+cuv45IRYRMGfnpa0WAMlBsmIpkrc/pxDM/7CGibiiwFc8DTDjjSfeLr4J6MGbyxjinQpU4pyQEDbiclDWghtgKWZk2id3xUw/5qB4x5Aqk+F5X+GnwOkqy5aEsGCRo4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7J34LdVM7n+zv0KvNXuvRuCEJhWtufIbCnkDFuUTAKib4JA1h/qkMyVe1DT1qESqw/f6M+u/A+7+fg2kgaoPDILWcHN5dQc94ic/xXi4weMoGxBSG0CqUZ4T2T7y/3qUDtPJoBGBq5BhgD4DwIrAxwtyh25ANv9qh+q1dVcDEHqLjz25RZ0RejGoCOC4udMaQopSeURyquPRcoXCYPMgSzqPnPIOBRnXFUVbVnNO0zSgDzjJpzpDtOomq2M5KrWeyQNREvjb0eSnLxXa3T8HCMPbByg3sBzke+Bxa7b1AyhAXNTHDaiJGqwVMhdN/iOF4W+bAXUQMOt0315PcmhU8iPvNo5nzt+LQ/h5ByDTa8oukSf0B3+Fd8btit2IXaXDA+h65lWeYkiIlKXxo76qrcbRJIYYx8p/ppyntB3tNgbllEGEMHenO1ltzS8IWFBd8eN+MacwjnU39mUarQ7qG5S+p/T6rEbrP5s5M23HwjXkVb7eKMJehBqRvhJt3PwuN7UKRNWVlNpWmMlOoxfg4yzTtR944C8+X5GOu/sExTn1I91EUinJbaawbvh3L4kySvLuSBMiK1YwE7CeVatI8zPaJ9OZQPK6gVYprwfhgzg8RGKIdoRJcfT/jyCdd8Tm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dEi0so7W5uTfFjRYiaYQDSG0CAwrGCEvURqQ6ltyULV3OZ6491K/gz3Uuzxv?= =?us-ascii?Q?xH4pPUywxr1QLlTX+guOshgnjGryiCzoSl+bW/nFxNf/riwdgLUblvbKv+1l?= =?us-ascii?Q?au5x6gaJD2PwN3mT5n0Lt+icMKKDoXWwIM8o/x3XShyZIykHxWIlIzz9kauJ?= =?us-ascii?Q?UYacdL4PSDNUc/jKl+2m+BKT1i3mSJigRu+ukG4IjUW0HDHPERBCWMSac8Bm?= =?us-ascii?Q?MpwWfcFtjDUieiRP3/VftPp0RVMhhIn6fGvufGJRV/PZWqPxGKQI6rjTsZMz?= =?us-ascii?Q?tEHbHINqCKNEaQi8sZmHJIOAcYD84BGlSPKmliyV9GKwyaogsyY4Vewizfzo?= =?us-ascii?Q?RJ5/gjYRe2vQ/sCDWB+CMiw1qX9ch8AwOHpjLCb6u7hMoLpUckw8ChAnjwow?= =?us-ascii?Q?Lt3zaR/1i6j9DaEPm6+ZY+bSJTvp2rIrc0HEMCOmn0TjLmu+uPFs08k1G9mn?= =?us-ascii?Q?r+g+DlZik/IG46f4kuGsM14ofym/UdaJJXgOyS1PdkAjNE/GUUQdAK4HbXPv?= =?us-ascii?Q?WvmZb9G5br5jQC2zLqjPRILTETbW/RZ24crMKketkJ0+Ma0PkgViXzXU57om?= =?us-ascii?Q?73CJA1+mtKjRx+93MAh+B4QhbLj11Zxznq6/2ks5KQSN6UgqwWTgYeW199P9?= =?us-ascii?Q?0i1N5O8Vbwn/s+Bb74PPPewv3axpQKp29jA+sfQQ7qtVSzvnClZBsT03Ujfr?= =?us-ascii?Q?BqQGoTFmFTP5bnrXkfXEPSAC1fTQ/rqiJSKcrivMFs/BTqS7FwO7KlOO0sZ/?= =?us-ascii?Q?RWtVzfXANHiqlB54Gdu35dYb8ylZiZw/8YIOjrp+gPXtz0dLQxOYiSklryYS?= =?us-ascii?Q?lNfpflm+PUHTw+vmjb0oJvXrSU/HC19k3UiLcK5I4NQf6TBPkwm4feawoXjk?= =?us-ascii?Q?uwhz+2eIO2Mlm0JQIgU+wpvJZm4O+UqjIs8VWbPFyHpePS6pehxGpXAxKOHz?= =?us-ascii?Q?71vZzDT6h8b3HqHRy+nBdguPt0EG7EnLHqMWNez+7YNrY7aOQtf7wnT1a8Wy?= =?us-ascii?Q?LjTUguKUT0dfsYAEK8Lm5R4eMcFaqxts+kbWp7xfrVtAe4qZ3DNyREW+BjpA?= =?us-ascii?Q?MiWpE+XD3Q3ey+FZoRQ236g9H3eQT4WvaI8vueyeJXBHd9D8R7JROq8HRxzW?= =?us-ascii?Q?qYfZ3IR2Rj4HZ/lnfbzEasHb7Sp4R/JRdBF1R4RWR3TiVZdbhQWN0Vevc3Vm?= =?us-ascii?Q?0eQd8c5yBMPnYbna+m4Eb3emSIE5TeTCyy7KSQtD3yvaq2JVo6s1UTYGrinz?= =?us-ascii?Q?PDdGAcI/bZINZm3EmTc8?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 182d154d-c849-40a4-6d20-08db91b7093e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2023 11:12:32.6043 (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: DU2P250MB0271 Subject: [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 Cc: Andreas Rheinhardt 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: 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; } -- 2.34.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".