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 B8D064CED5 for ; Mon, 11 Aug 2025 21:10:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9975068CC39; Tue, 12 Aug 2025 00:10:33 +0300 (EEST) Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id EA43B680459 for ; Tue, 12 Aug 2025 00:10:26 +0300 (EEST) Received: by mail-il1-f170.google.com with SMTP id e9e14a558f8ab-3da73df6c4eso34993715ab.0 for ; Mon, 11 Aug 2025 14:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754946625; x=1755551425; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8+ZV/SaQpUOpT4zQDbc/I4J6RNuInmngmYarr4R+eW4=; b=hIIk6DJxCwn7qp6HUumNfCD66IQyDjOeHwdrncfXvcdMKOiUoER47iiMm3+Ip/6FUX tyZVZJbINWhKY1FfVMcXQ7J52M2snYgg6HNMXQy3n8bD0mmcSNWUb7O1t5zcbkJ/KjTO kMF+AMr7keEGU7DIIGtbENZr357vhxRn8FeGKHUNmlB/30IDTsIGDSN1rHZwLp9E9KKq vVDN4omcTZASnzbix9mai0pnMahOJTfDdVKEcanqmJLhkxi/cR2blk4qXd0BHlRqZIDz 6V+HRuKY+A3qG1Y4VqNQRK4SMUgKyCHXW3xw/nQ50B9hE+hRhC6GY6AyrQf9498UjGGf u/uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754946625; x=1755551425; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8+ZV/SaQpUOpT4zQDbc/I4J6RNuInmngmYarr4R+eW4=; b=Yeif+5Z443jNnYb1wNQdqOyI7l0ENKhEP1RjqcFcEuAZHNFSzSS204Qj7ulHoVe3ly Cass61qNSTffnYykdZfYOe5SRkFtDqyroDjw+F5y1YNX1dVoh0x1uYhgxRyxLWwwQUda A4JI/5QRMvhlat/gSuxpKBpD9EMDCLi62lpfgmwWtolOHZkME49uetJ8645bJeVnfu4r TgMcbObsKI6vkWWt5cvY+GZLBqnKfSDd5hUPcyg1o8elXvhxu+d8NP805cgzYGzslQSC h/oeO7oaYkCvmYf+Nn04iWCE59cFtWhtFbhiwaKKd4UgTYnhQkx5CoWA31t9FI5g894g NBpg== X-Gm-Message-State: AOJu0YwhBGdSPkEyFyonftAh4dNPc1SA2hhjYdKjV6f91sp6LnnLIhA6 bL/W7xSJrr4jOzhVp1mrpXHH8MlQ0wDQY970B9ianBelVfFFZUpYq58cL8WdNQ== X-Gm-Gg: ASbGncsChsO6UoHBp+NbqiJr52vYBrMIWTPY7wFZ8NEeACEPQlkcmIvYtKBehjHwJo3 oLMA1xtGc12HMvCqa0XsKQJS9BGpRXJMg11fzgMK/W5ZIB9E2paihv+C7+27KK0/sNLoixWC+R+ uaWsGLkOzaie08CSLdnr4YjTK1CQo+TaB4rROckYQpCd9j0HA5ysuHJkvYffSyK6Iv4MtDox1dv EefANbKjIBHSJVR9Lz/t9Y/c281c8B89Lvnj9SrqOKfsZRTEJSY2hV3k/G0mn4UGmKTLURYPmYE ddcE4qI63TBFSBx1ExVnwCqfAaojiasN7FOGEQmtTk9538sOdBetIeIrhcrvSbroL0AWUb1iJQD IMrYORgQYDoseBUn3mJaZ4J1Ff6RutDoNUixm28mkfBeP X-Google-Smtp-Source: AGHT+IFdD5LEA6OsJn150VIOrCK5jQZDr/2T77IyRaVPW3RSlPx0CdeAcmGBf1Qmm23JKdP3G01QFw== X-Received: by 2002:a05:6e02:1fc1:b0:3e5:3a7d:fc99 with SMTP id e9e14a558f8ab-3e55aff6ebdmr15757505ab.10.1754946624981; Mon, 11 Aug 2025 14:10:24 -0700 (PDT) Received: from newman.cs.purdue.edu ([128.10.127.250]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3e54715eceasm20560545ab.10.2025.08.11.14.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 14:10:23 -0700 (PDT) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Aug 2025 21:10:21 +0000 Message-Id: <20250811211021.34174-1-jiashengjiangcool@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] tests/api/api-h264-test: Add proper error handling to avoid potential memory leaks 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: Jiasheng Jiang 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: Add proper error handling to free allocated memory to avoid potential memory leaks. Fixes: ca3b274552 ("api-h264-test: build with another api test") Signed-off-by: Jiasheng Jiang --- Changelog: v1 -> v2: 1. Fix the goto labels. --- tests/api/api-h264-test.c | 49 +++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c index e1e8803c1e..4a8324c789 100644 --- a/tests/api/api-h264-test.c +++ b/tests/api/api-h264-test.c @@ -55,13 +55,14 @@ static int video_decode_example(const char *input_filename) result = avformat_find_stream_info(fmt_ctx, NULL); if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n"); - return result; + goto close_fmt_ctx; } video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0); if (video_stream < 0) { - av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n"); - return -1; + av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n"); + result = -1; + goto close_fmt_ctx; } origin_par = fmt_ctx->streams[video_stream]->codecpar; @@ -69,44 +70,49 @@ static int video_decode_example(const char *input_filename) codec = avcodec_find_decoder(origin_par->codec_id); if (!codec) { av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n"); - return -1; + result = -1; + goto close_fmt_ctx; } ctx = avcodec_alloc_context3(codec); if (!ctx) { av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n"); - return AVERROR(ENOMEM); + result = AVERROR(ENOMEM); + goto close_fmt_ctx; } result = avcodec_parameters_to_context(ctx, origin_par); if (result) { av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n"); - return result; + goto free_ctx; } result = avcodec_open2(ctx, codec, NULL); if (result < 0) { av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n"); - return result; + goto free_ctx; } fr = av_frame_alloc(); if (!fr) { av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n"); - return AVERROR(ENOMEM); + result = AVERROR(ENOMEM); + goto free_ctx; } pkt = av_packet_alloc(); if (!pkt) { av_log(NULL, AV_LOG_ERROR, "Cannot allocate packet\n"); - return AVERROR(ENOMEM); + result = AVERROR(ENOMEM); + goto free_fr; } byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 16); byte_buffer = av_malloc(byte_buffer_size); if (!byte_buffer) { av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n"); - return AVERROR(ENOMEM); + result = AVERROR(ENOMEM); + goto free_pkt; } printf("#tb %d: %d/%d\n", video_stream, fmt_ctx->streams[video_stream]->time_base.num, fmt_ctx->streams[video_stream]->time_base.den); @@ -131,19 +137,19 @@ static int video_decode_example(const char *input_filename) if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); - return result; + goto free_byte_buffer; } while (result >= 0) { result = avcodec_receive_frame(ctx, fr); if (result == AVERROR_EOF) - goto finish; + goto free_byte_buffer; else if (result == AVERROR(EAGAIN)) { result = 0; break; } else if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n"); - return result; + goto free_byte_buffer; } number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size, @@ -152,7 +158,8 @@ static int video_decode_example(const char *input_filename) if (number_of_written_bytes < 0) { av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n"); av_frame_unref(fr); - return number_of_written_bytes; + result = number_of_written_bytes; + goto free_byte_buffer; } printf("%d, %s, %s, %8"PRId64", %8d, 0x%08"PRIx32"\n", video_stream, av_ts2str(fr->pts), av_ts2str(fr->pkt_dts), fr->duration, @@ -163,13 +170,19 @@ static int video_decode_example(const char *input_filename) i++; } -finish: + result = 0; + +free_byte_buffer: + av_freep(&byte_buffer); +free_pkt: av_packet_free(&pkt); +free_fr: av_frame_free(&fr); - avformat_close_input(&fmt_ctx); +free_ctx: avcodec_free_context(&ctx); - av_freep(&byte_buffer); - return 0; +close_fmt_ctx: + avformat_close_input(&fmt_ctx); + return result; } int main(int argc, char **argv) -- 2.25.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".