From patchwork Fri Mar 27 09:55:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18423 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 66C7B44AE5A for ; Fri, 27 Mar 2020 11:56:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50D2168B619; Fri, 27 Mar 2020 11:56:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C019868B58A for ; Fri, 27 Mar 2020 11:56:44 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id c81so10742842wmd.4 for ; Fri, 27 Mar 2020 02:56:44 -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=E9irR0mrD/nJgfljdkZEgRTTFbImRwF2D4GfW3wcQlk=; b=ZmPC9dZayVvdc9Ccy47J9VclmTo79Wib48i33faE4NxZwgoe7idnVFcnKaaza6st8T JiKKLJNsZIwTBvF9WHNLXScA170LYkbP6dO3QlE4Qc/58U3F+/HHdUFUCnjbXs0Fnci7 gP5vFoNzg7tPNKKNQs9NqTZzeiRkkFBNyUBEKgKTcA9T9D3wb6Iaae+Pcy7vLEs0MOoy onTxy9R8Gqehd1h4P9aHJOJx8tW5RdrzpN0QVUiGhz2LEdWRFM4rxYUmxGODEdubuW/L wUUEj7EcfbI32fI3dpKVY+z8+mSe9/40uaMbvvAc4tirz/9vZh5LiNJSTf8Us4zZMcwk THmw== 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=E9irR0mrD/nJgfljdkZEgRTTFbImRwF2D4GfW3wcQlk=; b=j23c5wSWn7iWfJEIx4BfIee1Ab4IopjXLHtvtWHHvaJcO3fjonvVG1FyT2UiSdI4px pYwkrzb21Dcqnvu6tjw5dQjKDqlTlvcfB5fu7a56ioD44UbNBef7qxrlZPTGhHn1eQBj ukPeGd+YcppbpBiXZt8iivkccbvmm49tEdxZAkiXAdOWQ37+66LgxOwew22sVhNyDj4S C4tLBpYIO+1S+arxeZNXHTSmDw6q6Xn4K3EBjrxMmRQ7XFSxCV0mrXOu6z7lbMPx0Cnx PYGtL050R58a8qsi1xVxJl0en3h8Wn+47V5cFVHqVAKEZU84DHTIM2BqC2Iw00/GZ7i9 GEvg== X-Gm-Message-State: ANhLgQ0tiPNLfaWv8wQ/5LvmvFZhAk82VHs+FQ0o/f8eieqzw/DUELoM wyXNbVI8Ss0TleT5XwXY0vKe85jR X-Google-Smtp-Source: ADFU+vsiJ/EztWV8QIIjKDS2AImI6wgDZuyJ/1inJbBXKY0WUn8dv5UMObF2njvgTe5EvbEuvAzP3Q== X-Received: by 2002:a7b:c8cd:: with SMTP id f13mr4582253wml.138.1585303003869; Fri, 27 Mar 2020 02:56:43 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id g2sm7931921wrs.42.2020.03.27.02.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 02:56:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Mar 2020 10:55:56 +0100 Message-Id: <20200327095557.24069-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327095557.24069-1-andreas.rheinhardt@gmail.com> References: <20200327095557.24069-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/avidec: Fix memleak when allocating DVDemuxContext fails 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" An AVIStream (intended to be used as private data for an AVStream) would leak in this scenario. Also return a more fitting error code instead of AVERROR_INVALIDDATA. Signed-off-by: Andreas Rheinhardt --- libavformat/avidec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 18402f0032..87298513c2 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -605,9 +605,12 @@ static int avi_read_header(AVFormatContext *s) ast = s->streams[0]->priv_data; st->priv_data = NULL; ff_free_stream(s, st); - avi->dv_demux = avpriv_dv_init_demux(s); - if (!avi->dv_demux) - goto fail; + + avi->dv_demux = avpriv_dv_init_demux(s); + if (!avi->dv_demux) { + av_free(ast); + return AVERROR(ENOMEM); + } s->streams[0]->priv_data = ast; avio_skip(pb, 3 * 4);