summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshbuf.c
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-02-26 13:40:09 +0000
committerjsg <jsg@openbsd.org>2020-02-26 13:40:09 +0000
commitc9831b39c7f05cf54db0775dea423b6be448db6e (patch)
treef50d8c53bee8b027f393d63b6867f7cdcf2c7a4b /usr.bin/ssh/sshbuf.c
parentHave sftp reject "-1" in the same way as ssh(1) and scp(1) do instead (diff)
downloadwireguard-openbsd-c9831b39c7f05cf54db0775dea423b6be448db6e.tar.xz
wireguard-openbsd-c9831b39c7f05cf54db0775dea423b6be448db6e.zip
change explicit_bzero();free() to freezero()
While freezero() returns early if the pointer is NULL the tests for NULL in callers are left to avoid warnings about passing an uninitialised size argument across a function boundry. ok deraadt@ djm@
Diffstat (limited to 'usr.bin/ssh/sshbuf.c')
-rw-r--r--usr.bin/ssh/sshbuf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshbuf.c b/usr.bin/ssh/sshbuf.c
index 1eaaf77854f..e8c4781cbdd 100644
--- a/usr.bin/ssh/sshbuf.c
+++ b/usr.bin/ssh/sshbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf.c,v 1.14 2020/01/23 07:10:22 dtucker Exp $ */
+/* $OpenBSD: sshbuf.c,v 1.15 2020/02/26 13:40:09 jsg Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -162,8 +162,7 @@ sshbuf_free(struct sshbuf *buf)
explicit_bzero(buf->d, buf->alloc);
free(buf->d);
}
- explicit_bzero(buf, sizeof(*buf));
- free(buf);
+ freezero(buf, sizeof(*buf));
}
void