From patchwork Wed Mar 24 05:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26588 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D514544B89C for ; Wed, 24 Mar 2021 07:41:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEBFC68AB05; Wed, 24 Mar 2021 07:41:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 101BD68A9E8 for ; Wed, 24 Mar 2021 07:41:25 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id e7so26117878edu.10 for ; Tue, 23 Mar 2021 22:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=U+yHGUsmJCHzIzgNaVSWE7I2c78a1ckUBKDNs7QTYlw=; b=m6fot+XtzpdTILuXt1J+7j3oaeQoU2kIf2fZd+qIAeot8GJj2yDjRFl+9zVzZjFl5O IiC4a5ZsC39vAOe2uzfBf/9NX/v4v7EmkHU26h3Rvu1CSq+2uYeLGjgnsAzGhL+rUmg+ o5MJLTRRG/1veE9dnb5doWRfwUWvFhklU33M06MelKq8NgnE1RK7EtPmZPHjeMfBjR/J 8mkrb9U5aHaXa0bgY0MECXr98WBmX4clhAqCm2KwLMv0RQmnbVcrKXtoWCEApsr984Y6 GIEMjNL8rwMqjmHfDUK/BRo1Jae1GleDeAqF/52SaKggmLj7SwAnEL8de21IeGd2aiMi e53A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=U+yHGUsmJCHzIzgNaVSWE7I2c78a1ckUBKDNs7QTYlw=; b=NjYAQjZc/XMxsbIVNq4+DZK95VPyPFcoKKYhD0vYOxzbf+xIjXbsF9zdCtgOm3E6Ke wBQkHIQu5LKZAu3UregHLpm8ynTgDgac68MPdhI/d8Z470LOHbuR/33IRhqqG+uSxQ1h obCQrXAaafwwV+wplGTQOVvNKnuDOTHS57tY2XQF09tL/9DbjyeR+BT55H0+oAjpXFQt 98PsCiX5OL2GSkFVG1Jn8iTKTc141IdAdLN5+LwBwxJVQ4+JOKadR/UJKmjNVfRNcd07 OprjoVKe7pC8aJUr4G41k7PtCaoX2OR+p9/fa/x39KF42N7uaQ0anfJn9x39EMkAsOjN zH3g== X-Gm-Message-State: AOAM53276+Vp0b6ORTssElEra+j1cPI/wTB1ySbWPIi8rg+DiuhBeh2F okxAU3GbUr8oXfDYy7l+0MPaafiWWXOA9Q== X-Google-Smtp-Source: ABdhPJw4bj3O+oLpJHaY48LUm8Ra3CZdmSdx3bbvaYM0TsMbmuIsLCduU7QOpDX7lRUyr8OC/Xf2uA== X-Received: by 2002:a50:e882:: with SMTP id f2mr1555435edn.184.1616564484346; Tue, 23 Mar 2021 22:41:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id n16sm561041edr.42.2021.03.23.22.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 22:41:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Mar 2021 06:40:40 +0100 Message-Id: <20210324054043.1729328-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210324054043.1729328-1-andreas.rheinhardt@gmail.com> References: <20210324054043.1729328-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/libgme: Fix memleaks on errors X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Also free the gme_info_t structure immediately after its use. This simplifies cleanup, because it might be unsafe to call gme_free_info(NULL) (or even worse, gme_track_info() might even on error set the pointer to the gme_info_t structure to something else than NULL). Signed-off-by: Andreas Rheinhardt --- libavformat/libgme.c | 48 ++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/libavformat/libgme.c b/libavformat/libgme.c index e6c56c4872..f9d9abaad5 100644 --- a/libavformat/libgme.c +++ b/libavformat/libgme.c @@ -31,7 +31,6 @@ typedef struct GMEContext { const AVClass *class; Music_Emu *music_emu; - gme_info_t *info; ///< selected track /* options */ int track_index; @@ -55,12 +54,16 @@ static void add_meta(AVFormatContext *s, const char *name, const char *value) av_dict_set(&s->metadata, name, value, 0); } -static int load_metadata(AVFormatContext *s) +static int load_metadata(AVFormatContext *s, int64_t *duration) { GMEContext *gme = s->priv_data; - gme_info_t *info = gme->info; + gme_info_t *info = NULL; char buf[30]; + if (gme_track_info(gme->music_emu, &info, gme->track_index)) + return AVERROR_STREAM_NOT_FOUND; + + *duration = info->length; add_meta(s, "system", info->system); add_meta(s, "game", info->game); add_meta(s, "song", info->song); @@ -71,20 +74,30 @@ static int load_metadata(AVFormatContext *s) snprintf(buf, sizeof(buf), "%d", (int)gme_track_count(gme->music_emu)); add_meta(s, "tracks", buf); + gme_free_info(info); return 0; } #define AUDIO_PKT_SIZE 512 +static int read_close_gme(AVFormatContext *s) +{ + GMEContext *gme = s->priv_data; + gme_delete(gme->music_emu); + return 0; +} + static int read_header_gme(AVFormatContext *s) { AVStream *st; AVIOContext *pb = s->pb; GMEContext *gme = s->priv_data; int64_t sz = avio_size(pb); + int64_t duration; char *buf; char dummy; + int ret; if (sz < 0) { av_log(s, AV_LOG_WARNING, "Could not determine file size\n"); @@ -103,6 +116,7 @@ static int read_header_gme(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "File size is larger than max_size option " "value %"PRIi64", consider increasing the max_size option\n", gme->max_size); + av_freep(&buf); return AVERROR_BUFFER_TOO_SMALL; } @@ -112,20 +126,24 @@ static int read_header_gme(AVFormatContext *s) } av_freep(&buf); - if (gme_track_info(gme->music_emu, &gme->info, gme->track_index)) - return AVERROR_STREAM_NOT_FOUND; - - if (gme_start_track(gme->music_emu, gme->track_index)) + ret = load_metadata(s, &duration); + if (ret < 0) { + read_close_gme(s); + return ret; + } + if (gme_start_track(gme->music_emu, gme->track_index)) { + read_close_gme(s); return AVERROR_UNKNOWN; - - load_metadata(s); + } st = avformat_new_stream(s, NULL); - if (!st) + if (!st) { + read_close_gme(s); return AVERROR(ENOMEM); + } avpriv_set_pts_info(st, 64, 1, 1000); if (st->duration > 0) - st->duration = gme->info->length; + st->duration = duration; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE); st->codecpar->channels = 2; @@ -153,14 +171,6 @@ static int read_packet_gme(AVFormatContext *s, AVPacket *pkt) return 0; } -static int read_close_gme(AVFormatContext *s) -{ - GMEContext *gme = s->priv_data; - gme_free_info(gme->info); - gme_delete(gme->music_emu); - return 0; -} - static int read_seek_gme(AVFormatContext *s, int stream_idx, int64_t ts, int flags) { GMEContext *gme = s->priv_data;