commit 89540b6de025b80404a0cb8418c06377f3f98848
author mmcc@openbsd.org <mmcc@openbsd.org> Fri Dec 11 02:31:47 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Dec 18 14:49:32 2015 +1100
tree e5ba6b2acbaab9aa3b89c3ff0c0b14adddfa19db
parent 79394ed6d74572c2d2643d73937dad33727fc240

upstream commit

Remove NULL-checks before sshkey_free().

ok djm@

Upstream-ID: 3e35afe8a25e021216696b5d6cde7f5d2e5e3f52

authfile.c

diff --git a/authfile.c b/authfile.c
index 668df7d..9cd490c 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.118 2015/12/10 17:08:40 mmcc Exp $ */
+/* $OpenBSD: authfile.c,v 1.119 2015/12/11 02:31:47 mmcc Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *
@@ -427,8 +427,7 @@
 
  out:
 	free(file);
-	if (pub != NULL)
-		sshkey_free(pub);
+	sshkey_free(pub);
 	return r;
 }
 
@@ -473,10 +472,8 @@
 	*keyp = key;
 	key = NULL;
  out:
-	if (key != NULL)
-		sshkey_free(key);
-	if (cert != NULL)
-		sshkey_free(cert);
+	sshkey_free(key);
+	sshkey_free(cert);
 	return r;
 }
 
@@ -537,8 +534,7 @@
 	}
 	r = SSH_ERR_KEY_NOT_FOUND;
  out:
-	if (pub != NULL)
-		sshkey_free(pub);
+	sshkey_free(pub);
 	fclose(f);
 	return r;
 }