From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 17 May 2016 15:52:45 +0000 (+0000)
Subject: PR/547: Close on exit to shut-up asan
X-Git-Tag: FILE5_28~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbc58c354367500bbc7a6bc73438073fd0db37ce;p=file

PR/547: Close on exit to shut-up asan
---

diff --git a/src/file.c b/src/file.c
index f7aa6efe..7a5a935d 100644
--- a/src/file.c
+++ b/src/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: file.c,v 1.169 2016/03/14 02:30:22 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.170 2016/03/31 17:51:12 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -351,9 +351,10 @@ main(int argc, char *argv[])
 		if (c == -1) {
 			(void)fprintf(stderr, "%s: %s\n", progname,
 			    magic_error(magic));
-			return 1;
+			e = 1;
+			goto out;
 		}
-		return 0;
+		goto out;
 	default:
 		if (magic == NULL)
 			if ((magic = load(magicfile, flags)) == NULL)
@@ -383,6 +384,7 @@ main(int argc, char *argv[])
 			e |= process(magic, argv[optind], wid);
 	}
 
+out:
 	if (magic)
 		magic_close(magic);
 	return e;