summaryrefslogtreecommitdiffstats
path: root/modules/proxy/mod_proxy_ftp.c
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2012-11-26 18:18:54 +0100
committerJim Jagielski <jim@apache.org>2012-11-26 18:18:54 +0100
commit18cc8e835b71e832d78c93bf97a6232a088747fb (patch)
treeeea6a00cea5546d277e0ef118309bc666698ef50 /modules/proxy/mod_proxy_ftp.c
parentmod_dumpio: Correctly log large messages + style issues (diff)
downloadapache2-18cc8e835b71e832d78c93bf97a6232a088747fb.tar.xz
apache2-18cc8e835b71e832d78c93bf97a6232a088747fb.zip
CVE-2012-3499 and CVE-2012-4558
Be sure to escape potential troubled strings git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1413732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/mod_proxy_ftp.c')
-rw-r--r--modules/proxy/mod_proxy_ftp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 4b7fef2fb4..b6e9f821bd 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -530,7 +530,9 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
" </head>\n"
" <body>\n <h2>Directory of "
"<a href=\"/\">%s</a>/%s",
- site, basedir, escpath, site, basedir, escpath, site, str);
+ ap_escape_html(p, site), basedir, escpath,
+ ap_escape_uri(p, site), basedir, escpath,
+ ap_escape_uri(p, site), str);
APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(str, strlen(str),
p, c->bucket_alloc));