diff options
author | jsg@openbsd.org <jsg@openbsd.org> | 2020-02-26 13:40:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-02-28 12:26:28 +1100 |
commit | d5ba1c03278eb079438bb038266d80d7477d49cb (patch) | |
tree | 6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /auth2-chall.c | |
parent | 9e3220b585c5be19a7431ea4ff8884c137b3a81c (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 'auth2-chall.c')
-rw-r--r-- | auth2-chall.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/auth2-chall.c b/auth2-chall.c index c57387b71..3acd0a837 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-chall.c,v 1.52 2019/11/13 04:47:52 deraadt Exp $ */ | 1 | /* $OpenBSD: auth2-chall.c,v 1.53 2020/02/26 13:40:09 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2001 Per Allansson. All rights reserved. | 4 | * Copyright (c) 2001 Per Allansson. All rights reserved. |
@@ -147,8 +147,7 @@ kbdint_free(KbdintAuthctxt *kbdintctxt) | |||
147 | if (kbdintctxt->device) | 147 | if (kbdintctxt->device) |
148 | kbdint_reset_device(kbdintctxt); | 148 | kbdint_reset_device(kbdintctxt); |
149 | free(kbdintctxt->devices); | 149 | free(kbdintctxt->devices); |
150 | explicit_bzero(kbdintctxt, sizeof(*kbdintctxt)); | 150 | freezero(kbdintctxt, sizeof(*kbdintctxt)); |
151 | free(kbdintctxt); | ||
152 | } | 151 | } |
153 | /* get next device */ | 152 | /* get next device */ |
154 | static int | 153 | static int |