summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2017-03-10 03:24:49 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2017-03-10 03:24:49 +0000
commit3f5e3c7beec74b08c16d56e206017ab2104f7dc5 (patch)
tree92a0211eca065d2e15767d4dba5daf03e5c4461d
parenta1b991f17127e31505566b6764f95da8bd2ff74b (diff)
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.",