From d59c910d6aac53b819143e1d8c5b0576e8317ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Fri, 14 Feb 2014 21:06:05 +0000 Subject: [PATCH] [mod_dirlisting] fix memory leak if pcre fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Stefan Bühler git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2941 152afb58-edef-0310-8abb-c4023f1b3aa9 --- NEWS | 1 + src/mod_dirlisting.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4abb2b33..5c3c4f5e 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ NEWS * [network/ssl] fix build error if TLSEXT is disabled * [mod_fastcgi] fix use after free (only triggered if fastcgi debug is active) * [mod_rrdtool] fix invalid read (string not null terminated) + * [mod_dirlisting] fix memory leak if pcre fails - 1.4.34 * [mod_auth] explicitly link ssl for SHA1 (fixes #2517) diff --git a/src/mod_dirlisting.c b/src/mod_dirlisting.c index 8380c05d..327106dc 100644 --- a/src/mod_dirlisting.c +++ b/src/mod_dirlisting.c @@ -730,7 +730,11 @@ static int http_list_directory(server *srv, connection *con, plugin_data *p, buf log_error_write(srv, __FILE__, __LINE__, "sd", "execution error while matching:", n); - return -1; + /* aborting would require a lot of manual cleanup here. + * skip instead (to not leak names that break pcre matching) + */ + exclude_match = 1; + break; } } else {