summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Rene Scharfe <l.s.r@web.de>2017-08-30 19:49:32 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-07 08:49:26 +0900
commit542627a4f79ffe1c21e759508ee3c6c4f1211be6 (patch)
tree4493797385cee1c8c9a75bb91da46fc11ff18932
parentThe fifth batch post 2.14 (diff)
downloadtgif-542627a4f79ffe1c21e759508ee3c6c4f1211be6.tar.xz
am: release strbufs after use in detect_patch_format()
Don't reset the strbufs l2 and l3 before use as if they were static, but release them at the end instead. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/am.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c
index c369dd1dce..3c50b03faa 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -671,9 +671,7 @@ static int detect_patch_format(const char **paths)
goto done;
}
- strbuf_reset(&l2);
strbuf_getline(&l2, fp);
- strbuf_reset(&l3);
strbuf_getline(&l3, fp);
/*
@@ -696,6 +694,8 @@ static int detect_patch_format(const char **paths)
done:
fclose(fp);
strbuf_release(&l1);
+ strbuf_release(&l2);
+ strbuf_release(&l3);
return ret;
}