summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2001-09-28 09:49:32 +0000
committerDamien Miller <djm@cvs.openbsd.org>2001-09-28 09:49:32 +0000
commit917ee2d0d5dc97b0492ca230f81dad1d38bc6e2e (patch)
treedf9d60c04315fe1182ed4e071cb9241a1eb96947 /usr.bin/ssh
parent491b273070b101dc6eaa5a9e2f86bf47f250b086 (diff)
Fix segv when smartcard communication error occurs during key load. ok markus@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/scard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/scard.c b/usr.bin/ssh/scard.c
index 8a8ffb3e80e..d7fd2c2ad85 100644
--- a/usr.bin/ssh/scard.c
+++ b/usr.bin/ssh/scard.c
@@ -24,7 +24,7 @@
#ifdef SMARTCARD
#include "includes.h"
-RCSID("$OpenBSD: scard.c,v 1.14 2001/09/17 20:22:14 markus Exp $");
+RCSID("$OpenBSD: scard.c,v 1.15 2001/09/28 09:49:31 djm Exp $");
#include <openssl/engine.h>
#include <sectok.h>
@@ -123,6 +123,7 @@ sc_read_pubkey(Key * k)
int len, sw, status = -1;
len = sw = 0;
+ n = NULL;
if (sc_fd < 0) {
status = sc_init();