From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6BA614E422 for ; Thu, 10 Jul 2025 02:21:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 04D3468F8F2; Thu, 10 Jul 2025 05:21:11 +0300 (EEST) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 36AAE68F8ED for ; Thu, 10 Jul 2025 05:21:04 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id af79cd13be357-7d9e2f85b77so81422185a.2 for ; Wed, 09 Jul 2025 19:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752114063; x=1752718863; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wQJuDOumenPRodvoZe2PfBierGGVnedsVhH6m0yCqQg=; b=NLWNVRwVadlQdBHDNDPYTBaFB7KQG6jt2pBt5qM4dimC98nDivEclUPk/4V7Jsi9Gh PvSoBOCwMnWWGoE0lNtCyFx7j2zTITXMW0GSG05OpxZRP2DbZths4r2QapN1mBi4KgfS RZd3azmIfkBg5uOxQk59PWhA46ss4br5oa9EoW0b/BfgR3FVnXgucDyha9ODp5Y5O9Rk 9tcRxJXUCkWjfYvQCJPRN+RYUJt5sO/k7h85SYAwLCNG7XjQEBMgELeKxhxxRvid96ol +s+N00ScOQIA/fq04DyYCJmK7UEXIZrSscUTs7ibbg9Wnvi7IYrG8lra2BpEacV74t+W WOHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752114063; x=1752718863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wQJuDOumenPRodvoZe2PfBierGGVnedsVhH6m0yCqQg=; b=aypN//+s7oD1ck1bv2X7rAEopBgYqVXsKWr0AyMP78k7IJn/vnlHCi8LAP/luzIKuV tFjcBHCehOkNkffb09qP9ReVeTWLvK/jFTr9tT7FfhvO587ELSgX953zHxRpSZM1IW+o GsEr7Bn+cRTrEBJ2KW3WYA/RPBa2feTW6ht1zG6nwPU80jlw38e79g+uhKaujeduH5eG 1AeR0ce4WEB2U0IHIR9I24EZG9xpM9SLreXvUSaWraC49umT7gWPBQFNzVgqdTzIad4Y 3Fg0a4yzF6zcyL3GGWEPd1o9HtiCNdFg9KE9oorYIws8Vu/1QuiZB6xSU2m2GQohTG4V MPSg== X-Gm-Message-State: AOJu0YyxS5L0eYhdT66ikK562wAOygpkaFeDwlBdSveWexi8K4Fr62HX Hfw0+4M+kbHAFB9/jIPU6cmLKztRxOtBsrBnOgzhWJrjzuSQAm6f3xLNdTpqfXW6 X-Gm-Gg: ASbGncvkxxlQm3avInczE/7CCGzp/c4Fhr9aVu925yJojtbLBSqBtFIX/ZwCKs80UK/ LS0h6/TwKMm7vagqw4bOLlIUNqvh+BJDymmy6r0UjuQlNl3cvFsydl6ZONuG+MQ0vbBfyiydm7Y ULtnmJyPDxpRA0qzLoRqJjmBVwaoAhr5gRcSH/vgzrbIeaUMkkPxZ8knP7xWOsFO+RNPNlCxm6f 9OgiyFCu/BiZWgyPFCjBJHEa3oKNouu59QpSUg9PWPr9gc/f97de8are9fslp6Fp4TkdH62Amdy 4CBCP3TA7zm55Z97Pqdp7yLBEqA9hLMtuBgJZ/H9qJaGQq1dy657Oy6i/jvpf66IFB/4/quNGu7 LBX0= X-Google-Smtp-Source: AGHT+IHmRRFY5UP0EO0rPsuyFmeyuB4bya0OCAB1stmRUUNsGtQzXzhvSY1Fl7WIMjp0A5ZTrxXEkQ== X-Received: by 2002:a05:620a:17a5:b0:7ca:f37a:2b4e with SMTP id af79cd13be357-7dc9a07570amr264196385a.23.1752114062526; Wed, 09 Jul 2025 19:21:02 -0700 (PDT) Received: from r760 ([188.253.126.212]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7dcde422c11sm37268885a.76.2025.07.09.19.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jul 2025 19:21:02 -0700 (PDT) From: Lidong Yan X-Google-Original-From: Lidong Yan <502024330056@smail.nju.edu.cn> To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Jul 2025 10:20:46 +0800 Message-ID: <20250710022047.1847641-3-502024330056@smail.nju.edu.cn> X-Mailer: git-send-email 2.50.0.107.g33b6ec8c79 In-Reply-To: <20250710022047.1847641-1-502024330056@smail.nju.edu.cn> References: <20250710022047.1847641-1-502024330056@smail.nju.edu.cn> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/iamf_writer: fix leaks of avio_open_dyn_buf() allocated memory 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: Lidong Yan <502024330056@smail.nju.edu.cn> 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: In iamf_write_codec_config(), if codec_id equals to AV_CODEC_ID_AAC, avio_open_dyn_buf() allocated memory would leak. Add ffio_free_dyn_buf() to free dyn_bc before return. In iamf_write_audio_element(), multiple places returns without free dyn_bc, replace return AVERROR* with goto cleanup and add cleanup code to free dyn_bc. Do the same thing for iamf_write_audio_element() and write_parameter_block(). Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn> --- libavformat/iamf_writer.c | 47 +++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index f88987790d..2e8df602b1 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -523,6 +523,7 @@ static int iamf_write_codec_config(const IAMFContext *iamf, avio_write(dyn_bc, codec_config->extradata, codec_config->extradata_size); break; case AV_CODEC_ID_AAC: + ffio_free_dyn_buf(&dyn_bc); return AVERROR_PATCHWELCOME; case AV_CODEC_ID_FLAC: avio_w8(dyn_bc, 0x80); @@ -774,7 +775,8 @@ static int iamf_write_audio_element(const IAMFContext *iamf, if (layout == 3 || layout == 4 || layout == 6 || layout == 7) { av_log(log_ctx, AV_LOG_ERROR, "demixing_info needed but not set in Stream Group #%u\n", audio_element->audio_element_id); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto cleanup; } } param_definition_types &= ~AV_IAMF_PARAMETER_DEFINITION_DEMIXING; @@ -794,7 +796,7 @@ static int iamf_write_audio_element(const IAMFContext *iamf, param_def = ff_iamf_get_param_definition(iamf, param->parameter_id); ret = param_definition(iamf, param_def, dyn_bc, log_ctx); if (ret < 0) - return ret; + goto cleanup; avio_w8(dyn_bc, demix->dmixp_mode << 5); // dmixp_mode avio_w8(dyn_bc, element->default_w << 4); // default_w @@ -806,24 +808,25 @@ static int iamf_write_audio_element(const IAMFContext *iamf, if (!param) { av_log(log_ctx, AV_LOG_ERROR, "recon_gain_info needed but not set in Stream Group #%u\n", audio_element->audio_element_id); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto cleanup; } ffio_write_leb(dyn_bc, AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN); // type param_def = ff_iamf_get_param_definition(iamf, param->parameter_id); ret = param_definition(iamf, param_def, dyn_bc, log_ctx); if (ret < 0) - return ret; + goto cleanup; } if (element->audio_element_type == AV_IAMF_AUDIO_ELEMENT_TYPE_CHANNEL) { ret = scalable_channel_layout_config(audio_element, dyn_bc); if (ret < 0) - return ret; + goto cleanup; } else { ret = ambisonics_config(audio_element, dyn_bc); if (ret < 0) - return ret; + goto cleanup; } init_put_bits(&pbc, header, sizeof(header)); @@ -835,9 +838,11 @@ static int iamf_write_audio_element(const IAMFContext *iamf, avio_write(pb, header, put_bytes_count(&pbc, 1)); ffio_write_leb(pb, dyn_size); avio_write(pb, dyn_buf, dyn_size); - ffio_free_dyn_buf(&dyn_bc); + ret = 0; - return 0; +cleanup: + ffio_free_dyn_buf(&dyn_bc); + return ret; } static int iamf_write_mixing_presentation(const IAMFContext *iamf, @@ -886,7 +891,8 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, if (av_dict_count(submix_element->annotations) != av_dict_count(mix->annotations)) { av_log(log_ctx, AV_LOG_ERROR, "Inconsistent amount of labels in submix %d from Mix Presentation id #%u\n", j, audio_element->audio_element_id); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto cleanup; } while ((tag = av_dict_iterate(submix_element->annotations, tag))) avio_put_str(dyn_bc, tag->value); @@ -901,7 +907,7 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, param_def = ff_iamf_get_param_definition(iamf, submix_element->element_mix_config->parameter_id); ret = param_definition(iamf, param_def, dyn_bc, log_ctx); if (ret < 0) - return ret; + goto cleanup; avio_wb16(dyn_bc, rescale_rational(submix_element->default_mix_gain, 1 << 8)); } @@ -909,7 +915,7 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, param_def = ff_iamf_get_param_definition(iamf, sub_mix->output_mix_config->parameter_id); ret = param_definition(iamf, param_def, dyn_bc, log_ctx); if (ret < 0) - return ret; + goto cleanup; avio_wb16(dyn_bc, rescale_rational(sub_mix->default_mix_gain, 1 << 8)); ffio_write_leb(dyn_bc, sub_mix->nb_layouts); // nb_layouts @@ -928,11 +934,13 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, } if (layout == FF_ARRAY_ELEMS(ff_iamf_sound_system_map)) { av_log(log_ctx, AV_LOG_ERROR, "Invalid Sound System value in a submix\n"); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto cleanup; } } else if (submix_layout->layout_type != AV_IAMF_SUBMIX_LAYOUT_TYPE_BINAURAL) { av_log(log_ctx, AV_LOG_ERROR, "Unsupported Layout Type value in a submix\n"); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto cleanup; } init_put_bits(&pbc, header, sizeof(header)); put_bits(&pbc, 2, submix_layout->layout_type); // layout_type @@ -974,9 +982,11 @@ static int iamf_write_mixing_presentation(const IAMFContext *iamf, avio_write(pb, header, put_bytes_count(&pbc, 1)); ffio_write_leb(pb, dyn_size); avio_write(pb, dyn_buf, dyn_size); - ffio_free_dyn_buf(&dyn_bc); + ret = 0; - return 0; +cleanup: + ffio_free_dyn_buf(&dyn_bc); + return ret; } int ff_iamf_write_descriptors(const IAMFContext *iamf, AVIOContext *pb, void *log_ctx) @@ -1098,7 +1108,8 @@ static int write_parameter_block(const IAMFContext *iamf, AVIOContext *pb, if (!audio_element) { av_log(log_ctx, AV_LOG_ERROR, "Invalid Parameter Definition with ID %u referenced by a packet\n", param->parameter_id); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto cleanup; } for (int j = 0; j < audio_element->nb_layers; j++) { @@ -1132,8 +1143,10 @@ static int write_parameter_block(const IAMFContext *iamf, AVIOContext *pb, dyn_size = avio_get_dyn_buf(dyn_bc, &dyn_buf); ffio_write_leb(pb, dyn_size); avio_write(pb, dyn_buf, dyn_size); - ffio_free_dyn_buf(&dyn_bc); + ret = 0; +cleanup: + ffio_free_dyn_buf(&dyn_bc); return 0; } -- 2.50.0.107.g33b6ec8c79 _______________________________________________ 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".