]> git.neil.brown.name Git - wiggle.git/commitdiff
vpatch: don't call fileno() on NULL
authorNeilBrown <neil@brown.name>
Fri, 27 Dec 2019 04:48:24 +0000 (15:48 +1100)
committerNeilBrown <neil@brown.name>
Fri, 27 Dec 2019 04:48:24 +0000 (15:48 +1100)
Move the check_dir() call to *after* we check if
fopen failed.

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

index a1aa0354c30a3296c21213e3c1e61ca0d86a477f..aba9775b769fce533177ad71d49a9f79aef43326 100644 (file)
--- 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);