mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that git_getpass() never returns NULL

Browse Source 
The result of git_getpass() is used without checking for NULL, so let's
just die() instead of returning NULL.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2010-09-29 23:22:32 +01:00
committed by Junio C Hamano
parent dbda967684
commit 8713feb16d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
connect.c
View File

@ -631,8 +631,12 @@ char *git_getpass(const char *prompt)
askpass = askpass_program; askpass = askpass_program;
if (!askpass) if (!askpass)
askpass = getenv("SSH_ASKPASS"); askpass = getenv("SSH_ASKPASS");
if (!askpass || !(*askpass)) if (!askpass || !(*askpass)) {
return getpass(prompt); char *result = getpass(prompt);
if (!result)
die_errno("Could not read password");
return result;
}
args[0] = askpass; args[0] = askpass;
args[1] = prompt; args[1] = prompt;