kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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"
maint
Junio C Hamano 2014-01-13 11:23:01 -08:00
parent ada6ebb6e9 e1c1a324fc
commit f5678f1333
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prompt.c
View File

@ -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)