From patchwork Sun Mar 22 03:47:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18327 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 CBB6444BCD9 for ; Sun, 22 Mar 2020 05:48:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2ABB68B56A; Sun, 22 Mar 2020 05:48:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4787668B4F9 for ; Sun, 22 Mar 2020 05:48:39 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id t7so7594453wrw.12 for ; Sat, 21 Mar 2020 20:48:39 -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=Zi4fVUPbTzEtTZ/+51yWzKtofuvdqaezrUoU5bcPD5c=; b=oAyAGrSCqBK77Gx0qdbnQ6S6TJlA47NV+q3bkGbTwRLUGHKIxM5ofAd+BB/Rmxcd40 23Dwnw4Fbf9e5IiCZueVeGfhaexwvVDcIUGnLCdm8JCL5SyPjIzw9kyD6sAtmgr8Dan+ YJ2cGI8Rgfsf0wAWlsA3sMhL+3Vf4FSY9DO7lxQmNrxRF3Zvf+tSt3GBE62HvTo5xHTm /edEuNp0WfEyYR9pltKXzFzuNSmtzirOGgpLA0LY/KVK7JwG/fZZMskmkjuSMAYL3pRc QfxcdBOD5ECqbJar/+1RX8jxAZdsEEvPgtgxEfC9SQFZ+99xyzTtlmr0ZBvLR9n6seWs jv7w== 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=Zi4fVUPbTzEtTZ/+51yWzKtofuvdqaezrUoU5bcPD5c=; b=ZEoOC0y2Ke7mDcBym0Wy/cnPASL0zsr4QJAsmCLBHFc0e2GMgcZHg34J8S4rI0ld5b /rGzXy0WfDLWvnSEYMkv6bwn4zbDAqZCM+9QCdCrslM6tpu6TK+5I0E7qGV6iazgPi34 4b885SGZ78GH5hT4FeqkV6wMOQSBD5TdG1O0M45UY7a2PF9idYE47/CxRcArNu6ysteH MDuyiCSFhO6XnI1m+sjllud4ZqFqLV/Nu/VtVSKqt2jK2e6a3sNUeNNW23OpaZE2cMo1 9BfNVz6H1jG4V607MLXb5iXWZEDsv4zn7t1gqpvKO25jMuAJh8VwFIx7Nd1IWZo8KDY+ Vq5g== X-Gm-Message-State: ANhLgQ3w37XxeALsKcbm6N6Ig2sTxluMI4zaCm8AuxRZ7MBtwwq1buUR 6Ky7cZlw6b1bmY3mgPAwxRjjuNHY X-Google-Smtp-Source: ADFU+vuI4qvJIDA1k3mZz7WRwfWJGpgof/d7YA402IXSkAJHR43Rph9vKyRdafkfPSZ6WAJBjWeEQQ== X-Received: by 2002:a5d:60c2:: with SMTP id x2mr20614236wrt.123.1584848918588; Sat, 21 Mar 2020 20:48:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:47 +0100 Message-Id: <20200322034756.29907-12-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 12/21] avformat/nutdec: 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/nutdec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 3779dce2a8..260dd514b6 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -805,7 +805,7 @@ static int nut_read_header(AVFormatContext *s) pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1; if (pos < 0 + 1) { av_log(s, AV_LOG_ERROR, "No main startcode found.\n"); - goto fail; + return AVERROR_INVALIDDATA; } } while (decode_main_header(nut) < 0); @@ -815,7 +815,7 @@ static int nut_read_header(AVFormatContext *s) pos = find_startcode(bc, STREAM_STARTCODE, pos) + 1; if (pos < 0 + 1) { av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); - goto fail; + return AVERROR_INVALIDDATA; } if (decode_stream_header(nut) >= 0) initialized_stream_count++; @@ -829,7 +829,7 @@ static int nut_read_header(AVFormatContext *s) if (startcode == 0) { av_log(s, AV_LOG_ERROR, "EOF before video frames\n"); - goto fail; + return AVERROR_INVALIDDATA; } else if (startcode == SYNCPOINT_STARTCODE) { nut->next_startcode = startcode; break; @@ -852,11 +852,6 @@ static int nut_read_header(AVFormatContext *s) ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv); return 0; - -fail: - nut_read_close(s); - - return AVERROR_INVALIDDATA; } static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int is_meta, int64_t maxpos) @@ -1304,4 +1299,5 @@ AVInputFormat ff_nut_demuxer = { .read_seek = read_seek, .extensions = "nut", .codec_tag = ff_nut_codec_tags, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };