upstream commit

Remove NULL-checks before free().

ok dtucker@

Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8

1 files changed, 2 insertions, 3 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index da1bd3847..3c5afe507 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.231 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.232 2015/12/10 17:08:40 mmcc Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1257,8 +1257,7 @@ load_identity_file(Identity *id)
                         explicit_bzero(passphrase, strlen(passphrase));
                         free(passphrase);
                 }
-                if (comment)
-                        free(comment);
+                free(comment);
                 if (private != NULL || quit)
                         break;
         }