summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-12-10 17:08:40 +0000
committerDamien Miller <djm@mindrot.org>2015-12-11 13:23:14 +1100
commitd59ce08811bf94111c2f442184cf7d1257ffae24 (patch)
tree5885ad687f762834250c9c3f5b53b3f1b750c9f1 /authfile.c
parent8e56dd46cb37879c73bce2d6032cf5e7f82d5a71 (diff)
upstream commit
Remove NULL-checks before free(). ok dtucker@ Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/authfile.c b/authfile.c
index 1907cb1cc..668df7d9e 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.117 2015/09/13 14:39:16 tim Exp $ */ 1/* $OpenBSD: authfile.c,v 1.118 2015/12/10 17:08:40 mmcc Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
4 * 4 *
@@ -426,8 +426,7 @@ sshkey_load_cert(const char *filename, struct sshkey **keyp)
426 r = 0; 426 r = 0;
427 427
428 out: 428 out:
429 if (file != NULL) 429 free(file);
430 free(file);
431 if (pub != NULL) 430 if (pub != NULL)
432 sshkey_free(pub); 431 sshkey_free(pub);
433 return r; 432 return r;