diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-03-10 03:24:48 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2017-03-10 15:25:11 +1100 |
commit | f6edbe9febff8121f26835996b1229b5064d31b7 (patch) | |
tree | 838b38a560cd94a391fef5deff7b9d769aec1621 | |
parent | 566b3a46e89a2fda2db46f04f2639e92da64a120 (diff) |
upstream commit
Plug mem leak on GLOB_NOMATCH case. From jjelen at
redhat.com via bz#2687, ok djm@
Upstream-ID: 8016a7ae97719d3aa55fb723fc2ad3200058340d
-rw-r--r-- | readconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 @@ -1500,6 +1500,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.", |