From patchwork Mon Feb 19 21:51:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46376 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1517858pzb; Mon, 19 Feb 2024 14:03:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUj3snxCeErMgrEpdZCJLD4QL+1QoLPoclyDabbJ8m+RSu1DmILiL9x0CB5BQH8g0VDFFAohiLyfC/2ubjfBlpBDBoWNhgafRfj6w== X-Google-Smtp-Source: AGHT+IFY4GfDkvc8z+msA/ZFYFubCqn8nrDeInzMS652IDc+jWx+e4iDf2ATb5P32WdLTM+02cJG X-Received: by 2002:a17:906:c794:b0:a3e:9885:954a with SMTP id cw20-20020a170906c79400b00a3e9885954amr2469126ejb.65.1708380233945; Mon, 19 Feb 2024 14:03:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j7-20020a170906430700b00a3d21e8d419si2809614ejm.285.2024.02.19.14.03.53; Mon, 19 Feb 2024 14:03:53 -0800 (PST) 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=CS+GMw0q; 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 9727368D426; Tue, 20 Feb 2024 00:03:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2028.outbound.protection.outlook.com [40.92.73.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5F2668C651 for ; Tue, 20 Feb 2024 00:03:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KfnH6RU/P3KHQrvTITa6YFx/rAwiVyd4Yo6ghZdqTFpvjM7Y2DhXqejXN6OiAvypZXcD/PdxInjA0aSSDROYkyIA294hrVbMYHKk+/Hr86e2GAQl22nhq2qmVbJiRTYO4yX113GkYc0RyyvnCDdYdYqTqPRAfYziWl2tOp9oXMIVpms6QtlSec/uwLRDdyAnjuMAPC9J3q9Z9t5/2J8SeCwo5f/xc5lj0L6moySB0P0C99eGhV0Sj4bpXLB5QiR+dmpl7dpenX1hwFRMj3DlBcpo+ghQzEq9Vf3ADAUBeYIVT3iLyigcqiKMf0DPG59XCP7QgvXL2qJflReiTpEB3g== 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=jxQsqRQlnCfiFafnBGx0eJU3eyqxfY8ADBoFp3zkFqg=; b=ZYinF+uYEERc0tXsMT5bQUrOP4XADSCTdt8HwKbf8b3NDSyNImMdAA1jq8NMUg262807xXJa/Ze97Z7kxTZYuSzrz+qnHWJ+uMAynCDbXd8ABr/PzeRXRbpNhwus4pKMCf6X1zmz2EU2QmWXsbes2MMIkI50Tzj+38CDRxI7WYejmJ9+IcFz4UmoRqDuNppUJh2b7NYG68toCuAu7dCKsgZeAqiT2qR5xbs2XWWRr9yHWNjj524K6shvdnoUPntkQv/nPA+pNMq06/EGYfVSn5qk9LloI51AsM6FRZb0xWNia1w4XDLauJMYlvh3r/5Z6Il4Br5C3zQKf2w07bl0Aw== 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=jxQsqRQlnCfiFafnBGx0eJU3eyqxfY8ADBoFp3zkFqg=; b=CS+GMw0qse2qnPKGcPGkc39ZY0kjPltkR5R3qW6648USqeOLXI3MDv31RD9f8VB4wpKSPqZN6EaV4BAAAerkeVRINThsM7idLq/Vw128wi2YyIb0v763skUX6r/iC25ILpYQKulADtvg/A3wxEISJApmUbzHPALFY1xqIE/bUA2K73eykawz1vAb6FJdYUPi8JCT0QqkQozI6EVi/5o8KPoYQJzukka61ZUB73n7u7T1sVBKx1SFQDZ2moKAkiedmhfbAx2VSaNosD/FNJUTWBiu6t3gL4OC01UW2VJ2KhybmdMA/BCm92zgF3glKfW1RTOoUcHtyGHvX1EZOjV2vg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0161.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:174::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Mon, 19 Feb 2024 21:49:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Mon, 19 Feb 2024 21:49:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2024 22:51:17 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [WxR/T1y1Z+GMau/86F6MWfgpxexxEkmLp7cP/QjojbE=] X-ClientProxiedBy: ZR2P278CA0072.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240219215121.743167-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0161:EE_ X-MS-Office365-Filtering-Correlation-Id: a38856cb-b85f-4188-9bc8-08dc3194a79a X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnomf9zhpdf2mR/+OogaImHYcORq6icNPBPsC4I4WfK8l9s8Li1djBjrMPPWFu5gp6krH0I/U5m+nE4HRvKu9tHpeN/x7fb5LdD7PMJgtRyOMUrI8Q7UUAqocgB9z8esOmeWogFhOYlS6yV/VRyCYHT5KO42xbKswPwVf1kpT1Cr4We4pb0qv+Z6HKHLXN4Cuw36eCGH5MGp5yGSWsRRoliIGRl7RPbW4YwwsMHVEtyxPSO4zC9OS/yc7RVyIOjob4xhTXj7XHtl1cDoasmWAfEXnQe1eq7767KgXxg/pJmgFOaPeu7yh3m9PH7Bt5iknOJaPqmSdcjJKJNe6NhjPVv5O/ASD0bG0Z3u0TDoACgy+gAQ1BQ7pD7Fx5Fua4gtwYWfYBHTjtem/TSBV5rIs7FIEvSG7TV77JDAtNzT4KJKR6jkxgrgg2uQJD3d2o32OiX7jf1YxyLnA0MYU3GNjBlUOIHOO+haSBZK65k+7ke6uSSJqYlJ1wZnGOQQ+kGCtZA8G04L5u/jldgto5rdmNurWw6lrwAjyQcN3reYLKj10XRMrJju2lhqSCHFNP1lscWFIsxbIsCt37PDRq21SlgQVaXeW6yUrnDLVuYNFSVqvRxs+WLtNEaUgkKFd7zTLwG4D6wrzcTlHTFulzyKJRebbN6fechTSBdZn2H3k5DNlvQu89RyWYf4iE/hMqHNw9UIF13xo5yYs9Wl+kWjHCYgmc7N1BfLSgcdc1IJXSIaBWYlcEsLPo/7E7Q+QxI5+CQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xNR0Dbwh4+pedxj45+9WafkrOudbIBaPJ7Em1L+UpwD298Ljzuo6GVZFVp7vrQ9kuSvc80LJUrM3rPQEVRc9p+jl/i2xV6ui8QEYhLfcZFSIFHrBqLaUT5jvcuTejr3d34SXIlo/z4PGqELLSztJmfBR+mW/VVjvuiy7EwBhdD2KGe9ZFvZGK7CR3F5F74/KUYBxz5joTfx1HsoCafGqx9c5G15eQQIhlDi6lGMdhe7Ts+3hlxxzUcwud/kkn3cr1dzpNWO+52EyA5WngxmfoPei6zQW0B9Hc7e+xx5+e68PTlv/JwSNNQldklJDB2VRBoBaG+817iBDwN9R4u/jLgjq89CkHghCArZgDjKfaIYqvbb3+M3v9hqiLhUVAE9aCOMfe4QZjpKzDljGiIgGB9DlWRyj9njTasHGKywfpkf2HNA/jOv3OxTvBTy9oGZn1zwAriApHIwCS1PP+Gm3QTrWbbhTtMzphainEntWuWYP2XTKObMFoiXAzkpu683atxdljoxYQQ9OsfLKoBXGnIqE2c0ptDshN5jKowKVWqdLfxGXHPZL4k3Qo13ALnIIAFfjykYLvMILFQg2qs1OvM7GKAt/Z3li6CFEvEclHNYXvX8RcVmy1myEhPPME5o5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0SKVYQmBbehEIxW75qpEzxL8MLOR87EAQ8t1zf/jW5JP8M3aXn4lQRO2BSUDdVZpMpVToqKx1KP5g70x1o7NqjnUMZ7AfWLQu481bOPtWm8LYBvdukjJFH633bFWg6cAYfY6dW/pPfJdG09TEGN7n9N0pjxfd+QGS2pj67xXkHxiFc7KLfAV52qyz6A8rK9UWU/Hj67IKFXcfLL/sYix7kFByA49r2472kOI76qKQcuxsnkMkHjfL0I/kBv33JCBrKHBZJ2dFbUa172PGRgwelBUE27fGe/HM4qItmOns8++muHistG4HMvkQaYqveVG10CnQrT9xEtowfkDwhK8DSO5E1KxeiSJ6kZlPxoqUVqGyIpRdt15MjxdpJ3DXWp+18/7vIScCxRdtx9EilcGGbyoRQJ5TVdJC3iaBNLR9b8kAIaOq5RUjRh+83vaaLFA/8J16k1y9wdRNe8ofDKi/g9WBevdjUhYLCIuHEzuMbZd/hL1jE7Qt4REKMwCS9faSkTd+3n5DFWTmOHik6DKqrYHpc+QBRJeBjqnuP4yjLydnwXno/MOgnl4wVA0h0ZA+RvrSlqAGvWjRM7e6j6RN7E69avJjj0+zw/7w4+xOVbtaAFKWirk1K7kIzBRbDFE3V403nDhSDk65WNpHbi6S7yre0Jeygm4qlO5tT+xN48SlKLfz+W0ytEfCW+VcEWOSGx3d7GBiK2c6O6PIetmWutM+boQWIfKz5koDS08ix+sFhhHYN7wMhaKhB6FWXYe+h8pU7pXZBN3mMCYxbj9UZCEUsm101YhnELayWIIcvkMPETFOEUTMgitzmgjpGaUGFdQSgi2R3DtGxrZInhMfal7opnXWuQB0xbDR2ynJsmWC9GIjCv5aYg/raggUftn6DyFt1bVlmo7Nssw5PZkSIDxE94iIiEvDIg8VFIr02aqEXYz2iXtizzcVHqkxFHQEx6ahBIuiS/bGib3WZYcMlvjlr6hzZrAFhO/NVY5okYG8HiF1TY6ahH0RzQfj7OBa077aLGv/ntxO08C//f7UWblUmjRyfc38D9FbSY+k81uwc95OIhgrsy8qKQ0ZhCI7RIGiCosRZsTuug+gnuLNkTYTQm3BPkyWuGLY7Yf2X76H5LEAdHXtFw57efexjPDsxGqhpC2w+wrcFFeqzm3fr1ff8uztcFhbwMITsyl755QlhJLrDAPZFbeIviAHlfR7kVEeHhmisOfLeQdGq5UB0eIaMaCgv2m/D32eU0uBx2a83QDPNiv9aNK0IAo8/Eb7SIQj1uLOR5y+dDhpsCbmQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a38856cb-b85f-4188-9bc8-08dc3194a79a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2024 21:49:31.8363 (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: PR3P250MB0161 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/iamf_writer: Don't leak on error when adding ParamDefinition 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: COJ8n5IbR6zo Fix this by postponing the allocation. Fixes Coverity issue #1559545. Signed-off-by: Andreas Rheinhardt --- libavformat/iamf_writer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index 1a360dee2f..897b06310f 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -138,10 +138,6 @@ static IAMFParamDefinition *add_param_definition(IAMFContext *iamf, AVIAMFParamD iamf->param_definitions = tmp; - param_definition = av_mallocz(sizeof(*param_definition)); - if (!param_definition) - return NULL; - if (audio_element) codec_config = iamf->codec_configs[audio_element->codec_config_id]; @@ -160,6 +156,10 @@ static IAMFParamDefinition *add_param_definition(IAMFContext *iamf, AVIAMFParamD param->constant_subblock_duration = codec_config->nb_samples; } + param_definition = av_mallocz(sizeof(*param_definition)); + if (!param_definition) + return NULL; + param_definition->mode = !!param->duration; param_definition->param = param; param_definition->audio_element = audio_element;