From 894c5fa60481006e8bafb4b1986c33c907c340f7 Mon Sep 17 00:00:00 2001 From: mouring Date: Wed, 4 Apr 2001 01:53:20 +0000 Subject: [PATCH] - stevesk@cvs.openbsd.org 2001/04/03 13:56:11 [sftp-glob.c ssh-agent.c ssh-keygen.c] free() -> xfree() --- ChangeLog | 3 +++ sftp-glob.c | 4 ++-- ssh-agent.c | 8 ++++---- ssh-keygen.c | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18598bf8..fe9ef327 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ - deraadt@cvs.openbsd.org 2001/04/02 17:32:23 [ssh-agent.1] grammar; slade@shore.net + - stevesk@cvs.openbsd.org 2001/04/03 13:56:11 + [sftp-glob.c ssh-agent.c ssh-keygen.c] + free() -> xfree() 20010403 - OpenBSD CVS Sync diff --git a/sftp-glob.c b/sftp-glob.c index f1252eec..208efeb1 100644 --- a/sftp-glob.c +++ b/sftp-glob.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sftp-glob.c,v 1.2 2001/03/16 08:16:18 djm Exp $"); +RCSID("$OpenBSD: sftp-glob.c,v 1.3 2001/04/03 13:56:11 stevesk Exp $"); #include "ssh.h" #include "buffer.h" @@ -104,7 +104,7 @@ struct dirent *fudge_readdir(struct SFTP_OPENDIR *od) void fudge_closedir(struct SFTP_OPENDIR *od) { free_sftp_dirents(od->dir); - free(od); + xfree(od); } void attrib_to_stat(Attrib *a, struct stat *st) diff --git a/ssh-agent.c b/ssh-agent.c index 6a0c0d07..e8362ded 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.53 2001/03/26 23:23:24 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $ */ /* * Author: Tatu Ylonen @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.53 2001/03/26 23:23:24 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $"); #include #include @@ -563,9 +563,9 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl) sz = howmany(n+1, NFDBITS) * sizeof(fd_mask); if (*fdrp == NULL || n > *fdl) { if (*fdrp) - free(*fdrp); + xfree(*fdrp); if (*fdwp) - free(*fdwp); + xfree(*fdwp); *fdrp = xmalloc(sz); *fdwp = xmalloc(sz); *fdl = n; diff --git a/ssh-keygen.c b/ssh-keygen.c index 496393ff..b0f81447 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.53 2001/03/26 23:23:24 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $"); #include #include @@ -256,7 +256,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen) key_sign(key, &sig, &slen, data, sizeof data); key_verify(key, sig, slen, data, sizeof data); - free(sig); + xfree(sig); } #endif return key; -- 2.45.1