diff options
author | mmcc@openbsd.org <mmcc@openbsd.org> | 2015-12-10 17:08:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-12-11 13:23:14 +1100 |
commit | d59ce08811bf94111c2f442184cf7d1257ffae24 (patch) | |
tree | 5885ad687f762834250c9c3f5b53b3f1b750c9f1 /sshconnect2.c | |
parent | 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71 (diff) |
upstream commit
Remove NULL-checks before free().
ok dtucker@
Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 5 |
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 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.231 2015/12/04 16:41:28 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.232 2015/12/10 17:08:40 mmcc Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1257,8 +1257,7 @@ load_identity_file(Identity *id) | |||
1257 | explicit_bzero(passphrase, strlen(passphrase)); | 1257 | explicit_bzero(passphrase, strlen(passphrase)); |
1258 | free(passphrase); | 1258 | free(passphrase); |
1259 | } | 1259 | } |
1260 | if (comment) | 1260 | free(comment); |
1261 | free(comment); | ||
1262 | if (private != NULL || quit) | 1261 | if (private != NULL || quit) |
1263 | break; | 1262 | break; |
1264 | } | 1263 | } |