From: NeilBrown <neil@brown.name>
Date: Fri, 27 Dec 2019 04:48:24 +0000 (+1100)
Subject: vpatch: don't call fileno() on NULL
X-Git-Tag: v1.2~5
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=d98d87496d8aef3eac8b94482a8cfe861e560d4e;p=wiggle.git

vpatch: don't call fileno() on NULL

Move the check_dir() call to *after* we check if
fopen failed.

Signed-off-by: NeilBrown <neil@brown.name>
---

diff --git a/vpatch.c b/vpatch.c
index a1aa035..aba9775 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -3117,11 +3117,11 @@ int vpatch(int argc, char *argv[], int patch, int strip,
 			break;
 		}
 		f = fopen(argv[1], "r");
-		check_dir(argv[1], fileno(f));
 		if (!f) {
 			fprintf(stderr, "%s: cannot open %s\n", Cmd, argv[0]);
 			exit(1);
 		}
+		check_dir(argv[1], fileno(f));
 		show_merge(argv[0], f, reverse, 0, NULL, NULL,
 			   replace, outfilename,
 			   selftest, ignore_blanks, just_diff, backup);