From c63bcc3dc00918e725e583e95816edc4a661d710 Mon Sep 17 00:00:00 2001 From: provos Date: Thu, 19 Oct 2000 16:45:16 +0000 Subject: don't reference freed memory. okay deraadt@ --- usr.bin/ssh/sshconnect2.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'usr.bin/ssh/sshconnect2.c') diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 1f3b5a261d4..6ba23d445c5 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.26 2000/10/14 12:16:56 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.27 2000/10/19 16:45:16 provos Exp $"); #include #include @@ -979,7 +979,7 @@ authmethod_lookup(const char *name) Authmethod * authmethod_get(char *authlist) { - char *name = NULL; + char *name = NULL, *authname_old; Authmethod *method = NULL; /* Use a suitable default if we're passed a nil list. */ @@ -1013,16 +1013,17 @@ authmethod_get(char *authlist) method = NULL; } - if (authname_current != NULL) - xfree(authname_current); - + authname_old = authname_current; if (method != NULL) { debug("next auth method to try is %s", name); authname_current = xstrdup(name); - return method; } else { debug("no more auth methods to try"); authname_current = NULL; - return NULL; } + + if (authname_old != NULL) + xfree(authname_old); + + return (method); } -- cgit v1.2.3-59-g8ed1b