diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:23 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:23 +0100 |
commit | 202f5a676221c244cd450086c334c2b59f339e86 (patch) | |
tree | d2f90a3a9ce2b33485c271eab01a48f02ef6fb5a /auth-options.c | |
parent | f0de78bd4f29fa688c5df116f3f9cd43543a76d0 (diff) | |
parent | 9ca7e9c861775dd6c6312bc8aaab687403d24676 (diff) |
Import openssh_8.3p1.orig.tar.gz
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/auth-options.c b/auth-options.c index 2d200944c..696ba6ac6 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.92 2020/03/06 18:15:38 markus 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 | ||
229 | struct sshauthopt * | 228 | struct sshauthopt * |
@@ -735,9 +734,11 @@ deserialise_array(struct sshbuf *m, char ***ap, size_t *np) | |||
735 | *np = n; | 734 | *np = n; |
736 | n = 0; | 735 | n = 0; |
737 | out: | 736 | out: |
738 | for (i = 0; i < n; i++) | 737 | if (a != NULL) { |
739 | free(a[i]); | 738 | for (i = 0; i < n; i++) |
740 | free(a); | 739 | free(a[i]); |
740 | free(a); | ||
741 | } | ||
741 | sshbuf_free(b); | 742 | sshbuf_free(b); |
742 | return r; | 743 | return r; |
743 | } | 744 | } |