summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2009-10-16 19:00:19 +0000
committerStefan Bühler <stbuehler@web.de>2009-10-16 19:00:19 +0000
commite087d5bf1e8d506bf289ba44351870aab655a214 (patch)
tree2bcb957a9d9d40385ff3d69c484c44e839c298f9
parent6ecb86159c63796a9263b2c7bb336dd03198d0b6 (diff)
downloadlighttpd-git-e087d5bf1e8d506bf289ba44351870aab655a214.tar.gz
fix mod_webdav crash from #1793 (fixes #2048, thx hiroya)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2665 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/mod_webdav.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index fda62ae2..13e18fb1 100644
--- a/NEWS
+++ b/NEWS
@@ -58,6 +58,7 @@ NEWS
* Add SSL Client Certificate verification (#1288)
* mod_fastcgi: Fix host->active_procs counter, return 503 if connect wasn't successful after 5 tries (fixes #1825)
* mod_accesslog: escape special characters (fixes #1551, thx icy)
+ * fix mod_webdav crash from #1793 (fixes #2048, thx hiroya)
- 1.4.23 - 2009-06-19
* Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)
diff --git a/src/mod_webdav.c b/src/mod_webdav.c
index d73185cf..4b119966 100644
--- a/src/mod_webdav.c
+++ b/src/mod_webdav.c
@@ -1841,7 +1841,7 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) {
con->http_status = 400;
return HANDLER_FINISHED;
}
- if (NULL != (sep2 = strchr(start, '@'))) {
+ if (NULL != (sep2 = memchr(start, '@', sep - start))) {
/* skip login information */
start = sep2 + 1;
}