summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2017-03-10 03:24:48 +0000
committerdtucker <dtucker@openbsd.org>2017-03-10 03:24:48 +0000
commitb07e598c37d88bc970e99838aaf970fabefdee8f (patch)
tree3290ecb2f3910406c1465254a7469eea00fee68c
parentPlug descriptor leaks of auth_sock. From jjelen at redhat.com via (diff)
downloadwireguard-openbsd-b07e598c37d88bc970e99838aaf970fabefdee8f.tar.xz
wireguard-openbsd-b07e598c37d88bc970e99838aaf970fabefdee8f.zip
Plug mem leak on GLOB_NOMATCH case. From jjelen at redhat.com via
bz#2687, ok djm@
-rw-r--r--usr.bin/ssh/readconf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 97b3550388b..1d53d1e648c 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.268 2017/02/03 23:01:19 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.269 2017/03/10 03:24:48 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1485,6 +1485,7 @@ parse_keytypes:
if (r == GLOB_NOMATCH) {
debug("%.200s line %d: include %s matched no "
"files",filename, linenum, arg2);
+ free(arg2);
continue;
} else if (r != 0 || gl.gl_pathc < 0)
fatal("%.200s line %d: glob failed for %s.",