[openssh-commits] [openssh] 05/12: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 7d4f96f9de2a18af0d9fa75ea89a4990de0344f5
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Tue Mar 24 20:09:11 2015 +0000

    upstream commit
    
    consistent check for NULL as noted by Nicholas
     Lemonias; ok djm@
---
 authfd.c      | 5 +++--
 ssh-keysign.c | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/authfd.c b/authfd.c
index 5d9414f..e65bcab 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.94 2015/01/14 20:05:27 djm Exp $ */
+/* $OpenBSD: authfd.c,v 1.95 2015/03/24 20:09:11 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -469,7 +469,8 @@ ssh_agent_sign(int sock, struct sshkey *key,
 	}
 	if ((r = sshbuf_get_string(msg, sigp, &len)) != 0)
 		goto out;
-	*lenp = len;
+	if (*lenp != NULL)
+		*lenp = len;
 	r = 0;
  out:
 	if (blob != NULL) {
diff --git a/ssh-keysign.c b/ssh-keysign.c
index bcf897a..5688202 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.47 2015/01/28 22:36:00 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.48 2015/03/24 20:09:11 markus Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -157,7 +157,7 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret,
 
 	if (fail && key != NULL)
 		sshkey_free(key);
-	else
+	else if (ret != NULL)
 		*ret = key;
 
 	return (fail ? -1 : 0);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.