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 @@
-/* $OpenBSD: auth-options.c,v 1.90 2019/11/25 00:54:23 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.92 2020/03/06 18:15:38 markus Exp $ */
 /*
  * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
  *
@@ -222,8 +222,7 @@ sshauthopt_free(struct sshauthopt *opts)
                 free(opts->permitlisten[i]);
         free(opts->permitlisten);
 
-        explicit_bzero(opts, sizeof(*opts));
-        free(opts);
+        freezero(opts, sizeof(*opts));
 }
 
 struct sshauthopt *
@@ -735,9 +734,11 @@ deserialise_array(struct sshbuf *m, char ***ap, size_t *np)
         *np = n;
         n = 0;
  out:
-        for (i = 0; i < n; i++)
-                free(a[i]);
-        free(a);
+        if (a != NULL) {
+                for (i = 0; i < n; i++)
+                        free(a[i]);
+                free(a);
+        }
         sshbuf_free(b);
         return r;
 }