From patchwork Tue Jan 7 13:55:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17237 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 D826844AC83 for ; Tue, 7 Jan 2020 15:56:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C065868ACF8; Tue, 7 Jan 2020 15:56:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6225368AC30 for ; Tue, 7 Jan 2020 15:56:17 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id c9so54046637wrw.8 for ; Tue, 07 Jan 2020 05:56:17 -0800 (PST) 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=iKVWlIAqWFBAeDn6RbDiQKfk9A7Hu0IZ9/QvAhHSFtc=; b=VU9fk6J8/kUDKSjsED4yoU29qnVm936u2kH8nXtCbz33BN0A06cIJuQmj90HjyfJvq w3IkuTTEweBuKvgUgUBfcdWDnOY8453CI+ANTjJ0+FgOnMj3ECRai73synLLo4UkFowj FaYEKzO6M2qA6EvCUK8HJAaECIQWKezK/zyh7wEdavZ+WgYP/igPJsj6b+UzVRGnk27W 4jNI4PeYxWznUzaeKQd05BQVAGYnGMxffgMJdrqtIHXckeG60gRT8DXGKkFFUnSNVVku bs29XGyPsGYhp+IEy8e4tgrpBnTLlVP5OFll+vf/qF/UvrREuq7meVwbo2MZnkep67mK jqsQ== 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=iKVWlIAqWFBAeDn6RbDiQKfk9A7Hu0IZ9/QvAhHSFtc=; b=bjdvu1MMu4OvimPys15o+sST4KdZrIAlNlFcHFnJJY/+57b14qyX/ZpsnHuQN0HBrO neUiXIXeRk1gBhQyMkWwHGsV2V8C4KUxUHcUfGg6US0V3t4fEU4iJ7pXW5Irjqwdgzay Bm0vJtzUlvDsNLvVpTvp9pNJLfDKmXQIbSVtH1fS5qT14ZfIheuJ3RKoZYU8E3H4u6/h TXZxL27ld74D5hgw9ysl8fI49erZ2TJMUIGY+ytW4IfvuRYvHTTJzyE0v+gUwjaQfF/O kJ/kSfwi/CO91TwfkpTOYx5NTKLIJfqa+YhgSKgBsx84tiYx1Xgf7ETR+YELoi0Yob4O NDNw== X-Gm-Message-State: APjAAAV3yS+oCpaSlhM9+2xgikSZR6552uWxUCGeEJpAiAzHUAxqsn5c hw+EzXqYXW/u17RgVPjzStt+5WEn X-Google-Smtp-Source: APXvYqxRmyMgbRkSRI9wlaRVxMRiEz6dXGknbFneJ8D7Vr2KSqkXEBh38cCjtloLEzrpt3LWLuW99A== X-Received: by 2002:a5d:46d0:: with SMTP id g16mr115024153wrs.287.1578405376757; Tue, 07 Jan 2020 05:56:16 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id e18sm76167730wrr.95.2020.01.07.05.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 05:56:15 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jan 2020 14:55:48 +0100 Message-Id: <20200107135549.22581-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107135549.22581-1-andreas.rheinhardt@gmail.com> References: <20200107135549.22581-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/11] avformat/wtvdec: Fix memleak when reading header 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" Fixes #8314. Signed-off-by: Andreas Rheinhardt --- libavformat/wtvdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 706e8ca38d..92629bb31b 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -993,8 +993,10 @@ static int read_header(AVFormatContext *s) } ret = parse_chunks(s, SEEK_TO_DATA, 0, 0); - if (ret < 0) + if (ret < 0) { + wtvfile_close(wtv->pb); return ret; + } avio_seek(wtv->pb, -32, SEEK_CUR); timeline_pos = avio_tell(s->pb); // save before opening another file