summaryrefslogtreecommitdiff
path: root/auth-options.c
diff options
context:
space:
mode:
authorjsg@openbsd.org <jsg@openbsd.org>2020-02-26 13:40:09 +0000
committerDamien Miller <djm@mindrot.org>2020-02-28 12:26:28 +1100
commitd5ba1c03278eb079438bb038266d80d7477d49cb (patch)
tree6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /auth-options.c
parent9e3220b585c5be19a7431ea4ff8884c137b3a81c (diff)
upstream: 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@ OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a
Diffstat (limited to 'auth-options.c')
-rw-r--r--auth-options.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/auth-options.c b/auth-options.c
index 2d200944c..b63782de7 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.90 2019/11/25 00:54:23 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.91 2020/02/26 13:40:09 jsg Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -222,8 +222,7 @@ sshauthopt_free(struct sshauthopt *opts)
222 free(opts->permitlisten[i]); 222 free(opts->permitlisten[i]);
223 free(opts->permitlisten); 223 free(opts->permitlisten);
224 224
225 explicit_bzero(opts, sizeof(*opts)); 225 freezero(opts, sizeof(*opts));
226 free(opts);
227} 226}
228 227
229struct sshauthopt * 228struct sshauthopt *