- djm@cvs.openbsd.org 2013/05/17 00:13:13

     [xmalloc.h cipher.c sftp-glob.c ssh-keyscan.c ssh.c sftp-common.c
     ssh-ecdsa.c auth2-chall.c compat.c readconf.c kexgexs.c monitor.c
     gss-genr.c cipher-3des1.c kex.c monitor_wrap.c ssh-pkcs11-client.c
     auth-options.c rsa.c auth2-pubkey.c sftp.c hostfile.c auth2.c
     servconf.c auth.c authfile.c xmalloc.c uuencode.c sftp-client.c
     auth2-gss.c sftp-server.c bufaux.c mac.c session.c jpake.c kexgexc.c
     sshconnect.c auth-chall.c auth2-passwd.c sshconnect1.c buffer.c
     kexecdhs.c kexdhs.c ssh-rsa.c auth1.c ssh-pkcs11.c auth2-kbdint.c
     kexdhc.c sshd.c umac.c ssh-dss.c auth2-jpake.c bufbn.c clientloop.c
     monitor_mm.c scp.c roaming_client.c serverloop.c key.c auth-rsa.c
     ssh-pkcs11-helper.c ssh-keysign.c ssh-keygen.c match.c channels.c
     sshconnect2.c addrmatch.c mux.c canohost.c kexecdhc.c schnorr.c
     ssh-add.c misc.c auth2-hostbased.c ssh-agent.c bufec.c groupaccess.c
     dns.c packet.c readpass.c authfd.c moduli.c]
     bye, bye xfree(); ok markus@

1 files changed, 7 insertions, 9 deletions

diff --git a/hostfile.c b/hostfile.c
index b6f924b23..69d0d289e 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.50 2010/12/04 13:31:37 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.51 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -96,7 +96,7 @@ extract_salt(const char *s, u_int l, char *salt, size_t salt_len)
         b64salt[b64len] = '\0';
 
         ret = __b64_pton(b64salt, salt, salt_len);
-        xfree(b64salt);
+        free(b64salt);
         if (ret == -1) {
                 debug2("extract_salt: salt decode error");
                 return (-1);
@@ -327,16 +327,14 @@ free_hostkeys(struct hostkeys *hostkeys)
         u_int i;
 
         for (i = 0; i < hostkeys->num_entries; i++) {
-                xfree(hostkeys->entries[i].host);
-                xfree(hostkeys->entries[i].file);
+                free(hostkeys->entries[i].host);
+                free(hostkeys->entries[i].file);
                 key_free(hostkeys->entries[i].key);
                 bzero(hostkeys->entries + i, sizeof(*hostkeys->entries));
         }
-        if (hostkeys->entries != NULL)
-                xfree(hostkeys->entries);
-        hostkeys->entries = NULL;
-        hostkeys->num_entries = 0;
-        xfree(hostkeys);
+        free(hostkeys->entries);
+        bzero(hostkeys, sizeof(*hostkeys));
+        free(hostkeys);
 }
 
 static int