summaryrefslogtreecommitdiff
path: root/www/apache20/files/patch-secfix-CAN-2005-3352
blob: 895e30345d6b4d98ef471247cf512095691e8a63 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
--- modules/mappers/mod_imap.c (original)
+++ modules/mappers/mod_imap.c Mon Dec 12 08:41:53 2005
@@ -342,7 +342,7 @@
     if (!strcasecmp(value, "referer")) {
         referer = apr_table_get(r->headers_in, "Referer");
         if (referer && *referer) {
-	    return apr_pstrdup(r->pool, referer);
+	    return ap_escape_html(r->pool, referer);
         }
         else {
 	    /* XXX:  This used to do *value = '\0'; ... which is totally bogus

--- server/util.c (original)
+++ server/util.c Mon Dec 12 08:41:53 2005
@@ -1762,6 +1762,8 @@
             j += 3;
         else if (s[i] == '&')
             j += 4;
+        else if (s[i] == '"')
+            j += 5;
 
     if (j == 0)
         return apr_pstrmemdup(p, s, i);
@@ -1779,6 +1781,10 @@
         else if (s[i] == '&') {
             memcpy(&x[j], "&", 5);
             j += 4;
+        }
+        else if (s[i] == '"') {
+            memcpy(&x[j], """, 6);
+            j += 5;
         }
         else
             x[j] = s[i];