aboutsummaryrefslogtreecommitdiff
path: root/prompt.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 10:33:16 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 10:33:16 -0800
commit56e648e2534a4eb76713a8843354620599098fa6 (patch)
tree5c6f3d7937a72f92bc62223b9eb69b9b4eaee8e5 /prompt.c
parent962fa6539c6f93825852c7bf52679bc98739e1a3 (diff)
parente1c1a324fc7061c8f170a113709724f1640addb3 (diff)
downloadgit-56e648e2534a4eb76713a8843354620599098fa6.tar.gz
git-56e648e2534a4eb76713a8843354620599098fa6.tar.xz
Merge branch 'jk/credential-plug-leak'
An earlier "clean-up" introduced an unnecessary memory leak. * jk/credential-plug-leak: Revert "prompt: clean up strbuf usage"
Diffstat (limited to 'prompt.c')
-rw-r--r--prompt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/prompt.c b/prompt.c
index d851807fe..d7bb17cb6 100644
--- a/prompt.c
+++ b/prompt.c
@@ -22,6 +22,7 @@ static char *do_askpass(const char *cmd, const char *prompt)
if (start_command(&pass))
return NULL;
+ strbuf_reset(&buffer);
if (strbuf_read(&buffer, pass.out, 20) < 0)
err = 1;
@@ -38,7 +39,7 @@ static char *do_askpass(const char *cmd, const char *prompt)
strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));
- return strbuf_detach(&buffer, NULL);
+ return buffer.buf;
}
char *git_prompt(const char *prompt, int flags)