upstream: fix null-deref on calloc failure; ok djm

OpenBSD-Commit-ID: a313519579b392076b7831ec022dfdefbec8724a

diff --git a/auth-options.c b/auth-options.c
index b63782de7dd07b685aafb49132ecb0ca561b92eb..696ba6ac6162b1fa0ad423b8b1f8e9452a2720e3 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.91 2020/02/26 13:40:09 jsg Exp $ */
+/* $OpenBSD: auth-options.c,v 1.92 2020/03/06 18:15:38 markus Exp $ */
 /*
  * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
  *
@@ -734,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;
 }