Date: Tue, 26 Sep 2017 09:35:23 +0200
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: Martin Kepplinger <martink@posteo.de>
Cc: linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tools: firewire: nosy-dump: fix a resource leak in
 main()
Message-ID: <20170926093523.343c9a6c@kant>
In-Reply-To: <20170913182116.24694-1-martink@posteo.de>
References: <20170913182116.24694-1-martink@posteo.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 919
Lines: 29

On Sep 13 Martin Kepplinger wrote:
> If option_input and option_output is true two files are opened
> consecutively. In case the second fopen() fails, let's fclose()
> the first one before returning early.
> 
> Signed-off-by: Martin Kepplinger <martink@posteo.de>
> ---
>  tools/firewire/nosy-dump.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/firewire/nosy-dump.c b/tools/firewire/nosy-dump.c
> index 3179c711bd65..228be406f206 100644
> --- a/tools/firewire/nosy-dump.c
> +++ b/tools/firewire/nosy-dump.c
> @@ -960,6 +960,8 @@ int main(int argc, const char *argv[])
>  		output = fopen(option_output, "w");
>  		if (output == NULL) {
>  			fprintf(stderr, "Could not open %s, %m\n", option_output);
> +			if (input)
> +				fclose(input);
>  			return -1;
>  		}
>  	}

When we return from main(), all files are closed implicitly.
-- 
Stefan Richter
-======----= =--= ==-=-
http://arcgraph.de/sr/