From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Jan 2014 19:23:01 +0000 (-0800)
Subject: Merge branch 'jk/credential-plug-leak' into maint
X-Git-Tag: v1.8.5.3~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f5678f133321c4873109d15fd9ee4612cc326e13?hp=ada6ebb6e9525d6cd0ce954edc04123d15a8650b

Merge branch 'jk/credential-plug-leak' into maint

An earlier "clean-up" introduced an unnecessary memory leak.

* jk/credential-plug-leak:
Revert "prompt: clean up strbuf usage"
---

diff --git a/prompt.c b/prompt.c
index d851807feb..d7bb17cb66 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)