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 619874CC9A for ; Fri, 27 Jun 2025 14:16:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id E756368CC8B; Fri, 27 Jun 2025 17:16:16 +0300 (EEST) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 05A9A68C8BB for ; Fri, 27 Jun 2025 17:16:10 +0300 (EEST) Received: by mail-io1-f68.google.com with SMTP id ca18e2360f4ac-86cf9f46b06so69869839f.2 for ; Fri, 27 Jun 2025 07:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751033768; x=1751638568; 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=V7MyuygPt8EtIalAL+pXnlKVY4Fpou4Tmmo3M2ZgN7I=; b=On39Del96e/K1ZuA4SShyQrp5LJpS/AC/atfVkQhE7WFP/+IKfULozQRyXkS4M3U6U m72lAZzAmajnFTHF8a+VMLIbddvuEGwOag6ttoQZli8Q74C7DbE4xRjUdmqRb8b7sW7b i5En3/bT3GaPP6mr4rgV683zot9U9tEVjjjVyDBob1Cx/CasIDvM4xRYRQ6iDyiVCg6U Qn9SW1xHrK5Q7z7Oo+gDJ3FTrZo3cC3YLVOfnw1QuXRU3ks5VBm/Nv3PyDs/GxwVm5Hp 33YxAAgzYunloo4lg4ZeQGZTVdCt0XG3LR+fPvRsZZlTYHAHqbofxSPj6Z9azUZaaTUd Qm5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751033768; x=1751638568; 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=V7MyuygPt8EtIalAL+pXnlKVY4Fpou4Tmmo3M2ZgN7I=; b=dTihLuAZRRj69h+sfFUUfCMNOfWkvBeupP2sa4BHK+qSgPFYnYsTn8rO4xf7twVXyf 7gZsCJAgMFhoH2FZT3XTVnWJSwNcijeYUhzgyi7rA+xxnhxBLEDi37fVz6kIfRf0S42K wDn4OjiS9GZ7IVYtgALISOrPP3zyfLvjBD5ELNy2OOp50zrMOuzCpoaMDU4mvHRuf6KN IMBbi8vJzLItfs0bIu9QSOj2o5ey2kUh768/b+U3H0qvVfkrgoF8yu56tX9H1EpU1meA JwgEvtYwZTT8N19PN/rY86X3quBDOglzmxcR87A43EUXaXfHLuZHPgHvefGE5qr7TKf8 BPhQ== X-Gm-Message-State: AOJu0YzjzZ10qa8w+IkMqoy5I0KeNpF61yY8wlQUzRCSNmOvhYoGS8pC 1geVVoe4KN/Tr7ndVSgj83eY/3qzjTGQX33eVfRyzna9jpmfCTOyPkaocRkcENxQwuSD2w== X-Gm-Gg: ASbGncsPNdmiutGlDnAe+0Zz3QiJ8yFuL129WmxRdaxT5Mi3voMtulFAoqzkxcAsPJ5 2DaBvPukmtF+wi5UixbiZKGFVuD+1aZl5OllZuMXs+9MY4jV+HuTQUL171Sq4bOTdlnvFRtTXBV +OfpYEqajY4f39J4hGIPJNMFxI4vEkyisVe0sQAM0RdLjWOhGGEKzromeYASnlXp1IqJQqkyMlf CqTazoZDeiXb0oiL//t+A5liT9H3HA5uK7FelKRMgyMGdEKTBoaUyCs8X99PjG4DmEBaARvWxvI eTmBImg8fK+vByhCjeGhZfydGOnd3y/i9m6ziGfiePKEZRSZ7x6Y0hzTslvhUMEyGK/B X-Google-Smtp-Source: AGHT+IHkBXaQJPaRBlezSlTiy0TAE49Pf2SSO8d1OS+16Kkz0qDvrRpq+urTh31OJdIAUVvdyJCUMw== X-Received: by 2002:a17:903:2451:b0:235:5a9:9769 with SMTP id d9443c01a7336-23ac4605d87mr48987955ad.25.1751033376618; Fri, 27 Jun 2025 07:09:36 -0700 (PDT) Received: from r760 ([188.253.126.206]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3c1d3csm18007685ad.207.2025.06.27.07.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jun 2025 07:09:36 -0700 (PDT) From: Lidong Yan X-Google-Original-From: Lidong Yan <502024330056@smail.nju.edu.cn> To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jun 2025 22:09:18 +0800 Message-ID: <20250627140918.2832152-5-502024330056@smail.nju.edu.cn> X-Mailer: git-send-email 2.50.0.108.g6ae0c543ae In-Reply-To: <20250627140918.2832152-1-502024330056@smail.nju.edu.cn> References: <20250627140918.2832152-1-502024330056@smail.nju.edu.cn> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] 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.108.g6ae0c543ae _______________________________________________ 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".