diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-03-24 20:09:11 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-03-27 12:00:52 +1100 |
commit | 7d4f96f9de2a18af0d9fa75ea89a4990de0344f5 (patch) | |
tree | 783c123d1bccf5308397bafc34fa9770b0b061b7 | |
parent | df100be51354e447d9345cf1ec22e6013c0eed50 (diff) |
upstream commit
consistent check for NULL as noted by Nicholas
Lemonias; ok djm@
-rw-r--r-- | authfd.c | 5 | ||||
-rw-r--r-- | ssh-keysign.c | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.94 2015/01/14 20:05:27 djm Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.95 2015/03/24 20:09:11 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -469,7 +469,8 @@ ssh_agent_sign(int sock, struct sshkey *key, | |||
469 | } | 469 | } |
470 | if ((r = sshbuf_get_string(msg, sigp, &len)) != 0) | 470 | if ((r = sshbuf_get_string(msg, sigp, &len)) != 0) |
471 | goto out; | 471 | goto out; |
472 | *lenp = len; | 472 | if (*lenp != NULL) |
473 | *lenp = len; | ||
473 | r = 0; | 474 | r = 0; |
474 | out: | 475 | out: |
475 | if (blob != NULL) { | 476 | if (blob != NULL) { |
diff --git a/ssh-keysign.c b/ssh-keysign.c index bcf897a05..56882027e 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.47 2015/01/28 22:36:00 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.48 2015/03/24 20:09:11 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -157,7 +157,7 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret, | |||
157 | 157 | ||
158 | if (fail && key != NULL) | 158 | if (fail && key != NULL) |
159 | sshkey_free(key); | 159 | sshkey_free(key); |
160 | else | 160 | else if (ret != NULL) |
161 | *ret = key; | 161 | *ret = key; |
162 | 162 | ||
163 | return (fail ? -1 : 0); | 163 | return (fail ? -1 : 0); |