[openssh-commits] [openssh] 06/22: upstream: fix null-deref on calloc failure; ok djm

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 5f25afe5216ba7f8921e04f79aa4ca0624eca820
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Fri Mar 6 18:15:38 2020 +0000

    upstream: fix null-deref on calloc failure; ok djm
    
    OpenBSD-Commit-ID: a313519579b392076b7831ec022dfdefbec8724a
---
 auth-options.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/auth-options.c b/auth-options.c
index b63782de..696ba6ac 100644
--- 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 at 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;
 }

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.