head	1.2;
access;
symbols
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.03.18.17.13.58;	author clement;	state dead;
branches;
next	1.1;

1.1
date	2005.12.12.20.31.53;	author clement;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to 1.3.37-1.57
@
text
@--- src/main/util.c (original)
+++ src/main/util.c Mon Dec 12 08:36:54 2005
@@@@ -1722,6 +1722,8 @@@@
 	    j += 3;
 	else if (s[i] == '&')
 	    j += 4;
+	else if (s[i] == '"')
+	    j += 5;
 
     if (j == 0)
 	return ap_pstrndup(p, s, i);
@@@@ -1739,6 +1741,10 @@@@
 	else if (s[i] == '&') {
 	    memcpy(&x[j], "&amp;", 5);
 	    j += 4;
+	}
+	else if (s[i] == '"') {
+	    memcpy(&x[j], "&quot;", 6);
+	    j += 5;
 	}
 	else
 	    x[j] = s[i];

--- src/modules/standard/mod_imap.c (original)
+++ src/modules/standard/mod_imap.c Mon Dec 12 08:36:54 2005
@@@@ -328,7 +328,7 @@@@
     if (!strcasecmp(value, "referer")) {
         referer = ap_table_get(r->headers_in, "Referer");
         if (referer && *referer) {
-	    return ap_pstrdup(r->pool, referer);
+	    return ap_escape_html(r->pool, referer);
         }
         else {
 	    /* XXX:  This used to do *value = '\0'; ... which is totally bogus

@


1.1
log
@SECURITY: CVE-2005-3352 (cve.mitre.org)
   mod_imap: Escape untrusted referer header before outputting in HTML
   to avoid potential cross-site scripting.  Change also made to
   ap_escape_html so we escape quotes.  Reported by JPCERT.
   [Mark Cox]

Reported by:	simon
@
text
@@

