From patchwork Sun Mar 22 03:47:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18326 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 EE84A44BCD9 for ; Sun, 22 Mar 2020 05:48:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFAA268B534; Sun, 22 Mar 2020 05:48:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5C6368AABE for ; Sun, 22 Mar 2020 05:48:34 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id a9so7595340wmj.4 for ; Sat, 21 Mar 2020 20:48:34 -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 :mime-version:content-transfer-encoding; bh=zzhcvSjJ2Hd9qnnb+DkRon3HcJk2LV0/jIbyY37+9Mg=; b=uH9LBslieNyaSLgg158ej3wv7d4gH9/GTGzcb2T40cm3vtOFSMYQhnobH4z6zJZBJl NQRaVQmLBp7jYYvSjlz7MmP6ka51mlqEH7hPz2tLlhAr7aV8yCEm+4TYvGUTRBFpIqXp /XOSPHJ0etx7aU/NbLr9siwS6VASVLt7YkxQvi/H1T6g8t6PBNswnL63IHryYNRhHwnR xN6ciMbQE/AGSc59La7k6N/jsjGSMV3871yX83GjUwzIZHbWRevg5eKrmd4fahdUPNqA PkgEauwGkJGvFmjIX1bOSsw+AH/Pd1JhukUt4FXOOtcXyT9PVP80CY5Hjb4IwgrKocfb K5Cg== 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:mime-version:content-transfer-encoding; bh=zzhcvSjJ2Hd9qnnb+DkRon3HcJk2LV0/jIbyY37+9Mg=; b=ATrg3RJCRgttyXxSXNQcSYEShLryAL9eYEl67s0WgOBWZumSssjJaAYPhpnw/UV+eh 9u+JTFsruvizM+eHg5JPomXvSQY8lCnXQvQl52WmPrEVFrQzIjQ4VO2z0YUkNHRsMUcm HOmByS8LTfsf5fZ64D5nfwvDP/GsxgaEJyWHpcsEP+EEiirsRqEiZ0a8rSa3+hXi67oi FucAkog6nVtw2bmU3F0VgWOOXue66WSSsAU2g+PHBnC/dhjWDFmnxoeZbxDO/ui57aTy x/vPuDKqKZGbNGz+MF/qyJBDNkFemzTYnhNaWIHRTcbr2A8B0C4alKQl1gMuwAp5fMV/ wLpg== X-Gm-Message-State: ANhLgQ1eZ+r1Q9w9Lo0J/OfWBuHJfQerF+6caQakdTcBkxLJtYZvT75g Hv4Cs/hxavjIEYiGg9e7llPwxSJn X-Google-Smtp-Source: ADFU+vvYQeNFyqONPMooMbpYuD69jQ1mm/4Cv2rLccbiEtvDU//2fEZSfO+23GbWQ+Op2HtVYWEh9g== X-Received: by 2002:a1c:5604:: with SMTP id k4mr18504857wmb.57.1584848913794; Sat, 21 Mar 2020 20:48:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:33 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:43 +0100 Message-Id: <20200322034756.29907-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/21] avformat/xmv: Simplify cleanup after read_header failure 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" by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/xmv.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 0c69d267de..288b1e8463 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -149,7 +149,6 @@ static int xmv_read_header(AVFormatContext *s) uint32_t file_version; uint32_t this_packet_size; uint16_t audio_track; - int ret; s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -177,10 +176,8 @@ static int xmv_read_header(AVFormatContext *s) avio_skip(pb, 2); /* Unknown (padding?) */ xmv->audio = av_mallocz_array(xmv->audio_track_count, sizeof(XMVAudioPacket)); - if (!xmv->audio) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!xmv->audio) + return AVERROR(ENOMEM); for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) { XMVAudioPacket *packet = &xmv->audio[audio_track]; @@ -214,8 +211,7 @@ static int xmv_read_header(AVFormatContext *s) packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) { av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n", audio_track); - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } } @@ -227,10 +223,6 @@ static int xmv_read_header(AVFormatContext *s) xmv->stream_count = xmv->audio_track_count + 1; return 0; - -fail: - xmv_read_close(s); - return ret; } static void xmv_read_extradata(uint8_t *extradata, AVIOContext *pb) @@ -592,4 +584,5 @@ AVInputFormat ff_xmv_demuxer = { .read_header = xmv_read_header, .read_packet = xmv_read_packet, .read_close = xmv_read_close, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };