From patchwork Sun Mar 22 03:47:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18324 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 4374444BCD9 for ; Sun, 22 Mar 2020 05:48:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2ACCF68B510; Sun, 22 Mar 2020 05:48:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C97668B4B3 for ; Sun, 22 Mar 2020 05:48:38 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id j17so8882237wru.13 for ; Sat, 21 Mar 2020 20:48:38 -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=Crsg7zgHrrPQVzszHiC7LMNXjX5m+HTDFD64UPiRD1c=; b=DpBTdSleUizUVO6/EGJ6mL1RVaHFkgX9cyzARlPAJAWaMf+0Rx70DQpQ03AokbH9K4 XSCeogBaCE/OM2j1F6cUSzxHsUCJbl1gPpbEO7HNknhxPzgeRMvGw7QVuZb0E/OnhdFZ tDW2V8AcZhQQiXSe5tlg7qUb+tPFa7z/NStxFUfvb4hJhc9L7GquXEn0yfrvOYjJgIlq LGzYc0lTdmNeZTW2uO5JSzSnMX4yeLAGIBHMVnjCYATJg7WY09CFuFf1rlBjYAMopArq FMS4ybAzSmgek3MGtXb629CZtJ6IRBm3HguPh5sPnzLHUEvdQ4F9TqYuARRdaJ9OqnaP l2fw== 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=Crsg7zgHrrPQVzszHiC7LMNXjX5m+HTDFD64UPiRD1c=; b=BMV1z482kJVqftd3ZPkXv9ae/Pzpy71veTWKhcWnrVDIMQuekEIzsFTHtjPBX/IgAr uk6Pkg8DcnmJGJdee1J36fYBhkn7Z0jUqgWWdlPXc8dyHn2f69YbPRUJWP8vaac2im2A +4VbzRkT+iLycpMvZkSLl3WsiqOdIn1ApA+BsoG67FMOOzcXqQZtZFAlxSxT3Z6212Xy ffQ0fFGVUKQbYwAP/1ucPHK4Lqj0TCGm2wBdVtDKbeHclPZRRn7W4drh6Px8ODDIKQJp u1xjPNgnf3NJn3Eq+7osWeCDUUyKYeX4tAocRwaPrn1Cfd65vYzo/UFlkbC+DwC2JGGY Z4jw== X-Gm-Message-State: ANhLgQ3AIXzVsQeapeeekCrfn/qI++ElHh30vnbEs0CkNGbwbWqWo57+ JOITSmpEaYye3FIDCocPcFK9IGDL X-Google-Smtp-Source: ADFU+vs5dBxrWx1qcxf4bdgDC2m0dkW+LoR8SFstG+t7KFbDrtX2sP5HgO5BBTOSFB7zfzVOjyQqsA== X-Received: by 2002:adf:90e1:: with SMTP id i88mr21643015wri.95.1584848917327; Sat, 21 Mar 2020 20:48:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:36 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:46 +0100 Message-Id: <20200322034756.29907-11-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 11/21] avformat/jvdec: 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/jvdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index 551f8069e6..efa034c9ce 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -114,7 +114,6 @@ static int read_header(AVFormatContext *s) jv->frames = av_malloc(ast->nb_index_entries * sizeof(JVFrame)); if (!jv->frames) { - av_freep(&ast->index_entries); return AVERROR(ENOMEM); } offset = 0x68 + ast->nb_index_entries * 16; @@ -137,9 +136,6 @@ static int read_header(AVFormatContext *s) - jvf->video_size - jvf->palette_size < 0) { if (s->error_recognition & AV_EF_EXPLODE) { - read_close(s); - av_freep(&jv->frames); - av_freep(&ast->index_entries); return AVERROR_INVALIDDATA; } jvf->audio_size = @@ -263,4 +259,5 @@ AVInputFormat ff_jv_demuxer = { .read_packet = read_packet, .read_seek = read_seek, .read_close = read_close, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };