From: Seija Kijin <doremylover123@xxxxxxxxx>
The fp check in these function are only relevant if goto has been taken.
Because of this, we should move the label so that fclose is not called.
This is because the goto is taken when fp is 0 anyway.
Signed-off-by: Seija Kijin <doremylover123@xxxxxxxxx>
---
bisect: remove check for fp and move the goto label after the fclose
The fp check in these function are only relevant if goto has been taken.
Because of this, we should move the label so that fclose is not called.
This is because the goto is taken when fp is 0 anyway.
Signed-off-by: Seija Kijin doremylover123@xxxxxxxxx
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1397%2FAtariDreams%2Ffclose-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1397/AtariDreams/fclose-v1
Pull-Request: https://github.com/git/git/pull/1397
builtin/bisect.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/bisect.c b/builtin/bisect.c
index cc9483e8515..2e5dbc8be3b 100644
--- a/builtin/bisect.c
+++ b/builtin/bisect.c
@@ -316,9 +316,9 @@ static int bisect_write(const char *state, const char *rev,
if (!nolog)
fprintf(fp, "git bisect %s %s\n", state, rev);
+ fclose(fp);
+
finish:
- if (fp)
- fclose(fp);
strbuf_release(&tag);
return res;
}
@@ -484,9 +484,9 @@ static int get_terms(struct bisect_terms *terms)
strbuf_getline_lf(&str, fp);
terms->term_good = strbuf_detach(&str, NULL);
+ fclose(fp);
+
finish:
- if (fp)
- fclose(fp);
strbuf_release(&str);
return res;
}
base-commit: 57e2c6ebbe7108b35ba30184dcbcb6c34c929ad8
--
gitgitgadget
