summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-12-05 09:03:31 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-12-05 09:03:31 +1100
commit094f1e99348bdcea46f62f5c0f0e9944ed698b4e (patch)
tree07ca9b09abc61cd74683646a2d513e00887c8db1
parentaf1f90925494deba97a4b877798cf250f7dc75cf (diff)
- djm@cvs.openbsd.org 2010/12/04 13:31:37
[hostfile.c] fix fd leak; spotted and ok dtucker
-rw-r--r--ChangeLog3
-rw-r--r--hostfile.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e60f137f..fb23d52b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@
18 behaviour of creating a symlink is available using its "-s" option 18 behaviour of creating a symlink is available using its "-s" option
19 or through the preexisting "symlink" command; based on a patch from 19 or through the preexisting "symlink" command; based on a patch from
20 miklos AT szeredi.hu in bz#1555; ok markus@ 20 miklos AT szeredi.hu in bz#1555; ok markus@
21 - djm@cvs.openbsd.org 2010/12/04 13:31:37
22 [hostfile.c]
23 fix fd leak; spotted and ok dtucker
21 24
2220101204 2520101204
23 - (djm) [openbsd-compat/bindresvport.c] Use arc4random_uniform(range) 26 - (djm) [openbsd-compat/bindresvport.c] Use arc4random_uniform(range)
diff --git a/hostfile.c b/hostfile.c
index 9145529cb..b6f924b23 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: hostfile.c,v 1.49 2010/11/29 23:45:51 djm Exp $ */ 1/* $OpenBSD: hostfile.c,v 1.50 2010/12/04 13:31:37 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -317,6 +317,7 @@ load_hostkeys(struct hostkeys *hostkeys, const char *host, const char *path)
317 num_loaded++; 317 num_loaded++;
318 } 318 }
319 debug3("%s: loaded %lu keys", __func__, num_loaded); 319 debug3("%s: loaded %lu keys", __func__, num_loaded);
320 fclose(f);
320 return; 321 return;
321} 322}
322 323