git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 1/2] Make sure that git_getpass() never returns NULL
Date: Wed, 29 Sep 2010 23:22:32 +0100	[thread overview]
Message-ID: <1285798953-15320-2-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <7vocbhsn03.fsf@alter.siamese.dyndns.org>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 connect.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/connect.c b/connect.c
index 3450cab..57dc20c 100644
--- a/connect.c
+++ b/connect.c
@@ -631,8 +631,12 @@ char *git_getpass(const char *prompt)
 		askpass = askpass_program;
 	if (!askpass)
 		askpass = getenv("SSH_ASKPASS");
-	if (!askpass || !(*askpass))
-		return getpass(prompt);
+	if (!askpass || !(*askpass)) {
+		char *result = getpass(prompt);
+		if (!result)
+			die_errno("Could not read password");
+		return result;
+	}
 
 	args[0] = askpass;
 	args[1]	= prompt;
-- 
1.7.3

  parent reply	other threads:[~2010-09-29 22:23 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-28  9:46 Pull request for msysGit patches Pat Thoyts
2010-09-28 19:10 ` Junio C Hamano
2010-09-28 21:11   ` [msysGit] " Johannes Sixt
2010-09-29  3:41     ` Junio C Hamano
2010-09-28 21:23   ` Ævar Arnfjörð Bjarmason
2010-09-30 22:15     ` Pat Thoyts
2010-09-30 22:52       ` Ævar Arnfjörð Bjarmason
2010-09-30 23:27       ` Erik Faye-Lund
2010-09-29  2:01   ` [msysGit] " Eric Sunshine
     [not found]     ` <7vbp7hrzhb.fsf@alter.siamese.dyndns.org>
2010-09-29  3:54       ` Eric Sunshine
2010-09-29 22:22   ` msysGit patches for upstream Pat Thoyts
2010-09-29 23:02     ` Junio C Hamano
2010-09-29 22:22   ` Pat Thoyts [this message]
2010-09-29 22:22   ` [PATCH 2/2] Fix typo in pack-objects' usage Pat Thoyts
2010-09-28 20:52 ` [msysGit] Pull request for msysGit patches Johannes Sixt
2010-09-28 20:58   ` Erik Faye-Lund
2010-09-28 21:13     ` Johannes Sixt
2010-09-28 21:20       ` Erik Faye-Lund
2010-09-28 21:35         ` Erik Faye-Lund
2010-09-28 21:08   ` Jonathan Nieder
2010-09-29 17:51     ` Junio C Hamano
2010-09-29 22:29       ` Pat Thoyts
2010-09-29  2:23   ` Eric Sunshine
2010-09-29  3:37     ` Junio C Hamano
2010-09-29  4:17       ` Eric Sunshine
2010-09-30 13:24   ` [PATCH] git-am: fix detection of absolute paths for windows Pat Thoyts
2010-10-01 17:46     ` Johannes Sixt
2010-09-30 13:24       ` Pat Thoyts
2010-11-07 14:56   ` [PATCH v2 0/4] make open/unlink failures user friendly on windows using retry/abort Heiko Voigt
2010-11-07 15:49     ` Johannes Sixt
2010-11-07 17:06       ` Heiko Voigt
2010-11-07 19:11         ` Johannes Sixt
2010-11-07 14:56   ` [PATCH v2 1/4] mingw: move unlink wrapper to mingw.c Heiko Voigt
2010-11-07 14:56   ` [PATCH v2 2/4] mingw: work around irregular failures of unlink on windows Heiko Voigt
2010-11-07 14:56   ` [PATCH v2 3/4] mingw: make failures to unlink or move raise a question Heiko Voigt
2010-11-07 14:56   ` [PATCH v2 4/4] mingw: add fallback for rmdir in case directory is in use Heiko Voigt
2010-09-29  6:11 ` Pull request for msysGit patches yj2133011
2010-09-29 20:48 ` Ramsay Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1285798953-15320-2-git-send-email-patthoyts@users.sourceforge.net \
    --to=patthoyts@users.sourceforge.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).