commit d59ce08811bf94111c2f442184cf7d1257ffae24
author mmcc@openbsd.org <mmcc@openbsd.org> Thu Dec 10 17:08:40 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Dec 11 13:23:14 2015 +1100
tree 5885ad687f762834250c9c3f5b53b3f1b750c9f1
parent 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71

upstream commit

Remove NULL-checks before free().

ok dtucker@

Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8

ssh-rsa.c

diff --git a/ssh-rsa.c b/ssh-rsa.c
index 6b85895..4eb00c8 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.56 2015/12/07 20:04:09 markus Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.57 2015/12/10 17:08:40 mmcc Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -226,8 +226,7 @@
 		explicit_bzero(sigblob, len);
 		free(sigblob);
 	}
-	if (ktype != NULL)
-		free(ktype);
+	free(ktype);
 	if (b != NULL)
 		sshbuf_free(b);
 	explicit_bzero(digest, sizeof(digest));